summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | Merge branch 'jc/mktree'Junio C Hamano2009-05-317-135/+280
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | mktree: validate entry type in inputJosh Micich2009-05-161-10/+33
| * | | | | | | | | | | | | | mktree --batch: build more than one tree objectJosh Micich2009-05-162-8/+40
| * | | | | | | | | | | | | | mktree --missing: updated usage message and man pageJosh Micich2009-05-162-4/+11
| * | | | | | | | | | | | | | mktree --missing: allow missing objectsJunio C Hamano2009-05-102-4/+19
| * | | | | | | | | | | | | | t1010: add mktree testJunio C Hamano2009-05-101-0/+61
| * | | | | | | | | | | | | | mktree: do not barf on a submodule commitJunio C Hamano2009-05-101-1/+8
| * | | | | | | | | | | | | | builtin-mktree.c: use a helper function to handle one line of inputJunio C Hamano2009-05-101-40/+42
| * | | | | | | | | | | | | | mktree: use parse-optionsJunio C Hamano2009-05-101-10/+10
| * | | | | | | | | | | | | | build-in git-mktreeJunio C Hamano2009-05-104-12/+10
* | | | | | | | | | | | | | | Merge branch 'ew/svn-test-and-old-i18n'Junio C Hamano2009-05-3117-93/+91
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ t9139 uses ancient, backwards-compatible iconv namesEric Wong2009-05-3017-93/+91
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | t8005: fix typo, it's ISO-8859-5, not KOI8-RBrandon Casey2009-05-271-1/+1
| | * | | | | | | | | | | | | | | t8005: convert CP1251 character set to ISO8859-5Brandon Casey2009-05-223-15/+15
| | * | | | | | | | | | | | | | | t8005: use more portable character encoding namesBrandon Casey2009-05-221-3/+3
| | * | | | | | | | | | | | | | | t5100: use ancient encoding syntax for backwards compatibilityBrandon Casey2009-05-182-20/+20
| | * | | | | | | | | | | | | | | t9301: use ISO8859-1 rather than ISO-8859-1Brandon Casey2009-05-181-1/+1
| | * | | | | | | | | | | | | | | t3901: Use ISO8859-1 instead of ISO-8859-1 for backward compatibilityBrandon Casey2009-05-181-20/+20
| | * | | | | | | | | | | | | | | t3901: avoid negation on right hand side of '|'Brandon Casey2009-05-181-1/+1
| | * | | | | | | | | | | | | | | builtin-mailinfo.c: use "ISO8859-1" instead of "latin1" as fallback encodingBrandon Casey2009-05-181-1/+1
| | * | | | | | | | | | | | | | | builtin-mailinfo.c: compare character encodings case insensitivelyBrandon Casey2009-05-181-4/+2
| | * | | | | | | | | | | | | | | Use 'UTF-8' rather than 'utf-8' everywhere for backward compatibilityBrandon Casey2009-05-184-6/+6
| | * | | | | | | | | | | | | | | t3900: use ancient iconv names for backward compatibilityBrandon Casey2009-05-185-20/+20
* | | | | | | | | | | | | | | | | Merge branch 'mw/send-email'Junio C Hamano2009-05-312-20/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | send-email: Remove superfluous `my $editor = ...'Michael Witten2009-04-141-2/+0
| * | | | | | | | | | | | | | | | | send-email: 'References:' should only reference what is sentMichael Witten2009-04-141-4/+10
| * | | | | | | | | | | | | | | | | send-email: Handle "GIT:" rather than "GIT: " during --composeMichael Witten2009-04-141-2/+2
| * | | | | | | | | | | | | | | | | Docs: send-email: --smtp-server-port can take symbolic portsMichael Witten2009-04-141-1/+3
| * | | | | | | | | | | | | | | | | Docs: send-email: Refer to CONFIGURATION section for sendemail.multieditMichael Witten2009-04-141-3/+4
| * | | | | | | | | | | | | | | | | Docs: send-email: Put options back into alphabetical orderMichael Witten2009-04-141-11/+11
* | | | | | | | | | | | | | | | | | Merge branch 'cc/bisect' (early part)Junio C Hamano2009-05-314-55/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | bisect: check ancestors without forking a "git rev-list" processChristian Couder2009-05-172-44/+23
| * | | | | | | | | | | | | | | | | | commit: add function to unparse a commit and its parentsChristian Couder2009-05-172-0/+22
| * | | | | | | | | | | | | | | | | | bisect: rework some rev related functions to make them more reusableChristian Couder2009-05-171-11/+14
* | | | | | | | | | | | | | | | | | | git-add: no need for -f when resolving a conflict in already tracked pathJeff King2009-05-312-1/+13
* | | | | | | | | | | | | | | | | | | config.txt: document add.ignore-errorsStephen Boyd2009-05-311-0/+5
* | | | | | | | | | | | | | | | | | | bash: remove always true if statement from __git_ps1()SZEDER Gábor2009-05-311-6/+4
* | | | | | | | | | | | | | | | | | | git-apply(1): Clarify that one can select where to apply the patchBjörn Steinbrink2009-05-311-1/+1
* | | | | | | | | | | | | | | | | | | http-push: reuse existing is_null_refClemens Buchacher2009-05-311-16/+5
| |_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge git://git.bogomips.org/git-svnJunio C Hamano2009-05-302-3/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | git-svn: refuse to dcommit non-UTF-8 messagesEric Wong2009-05-282-3/+61
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Documentation: teach stash/pop workflow instead of stash/applyThomas Rast2009-05-302-16/+18
* | | | | | | | | | | | | | | | | | Merge branch 'sb/maint-1.6.2-opt-filename-fix'Junio C Hamano2009-05-296-0/+93
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | apply, fmt-merge-msg: use relative filenamesStephen Boyd2009-05-234-0/+79
| * | | | | | | | | | | | | | | | | commit: -F overrides -tStephen Boyd2009-05-232-0/+14
* | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-add-p-coalesce-fix'Junio C Hamano2009-05-292-1/+133
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | t3701: ensure correctly set up repository after skipped testsJohannes Sixt2009-05-251-0/+6
| * | | | | | | | | | | | | | | | | Revert "git-add--interactive: remove hunk coalescing"Junio C Hamano2009-05-162-2/+96
| * | | | | | | | | | | | | | | | | Splitting a hunk that adds a line at the top fails in "add -p"Matt Graham2009-05-161-0/+32
* | | | | | | | | | | | | | | | | | Merge branch 'rs/maint-grep-word-regexp-fix'Junio C Hamano2009-05-292-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |
View Lorry Controller Status