summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* rebase: fix --onto A...B parsing and add testsNanako Shiraishi2010-01-072-14/+94
* "rebase --onto A...B" replays history on the merge base between A and BJunio C Hamano2009-11-211-1/+18
* "checkout A...B" switches to the merge base between A and BJunio C Hamano2009-10-184-3/+74
* git checkout --no-guessJunio C Hamano2009-10-211-0/+5
* DWIM "git checkout frotz" to "git checkout -b frotz origin/frotz"Junio C Hamano2009-10-181-3/+57
* check_filename(): make verify_filename() callable without dyingJunio C Hamano2009-10-182-18/+21
* Start 1.6.6 cycleJunio C Hamano2009-10-173-2/+62
* Merge branch 'jc/maint-blank-at-eof'Junio C Hamano2009-10-178-173/+437
|\
| * Merge branch 'jc/maint-1.6.0-blank-at-eof' into jc/maint-blank-at-eofJunio C Hamano2009-09-151-22/+47
| |\
| | * diff -B: colour whitespace errorsJunio C Hamano2009-09-151-26/+49
| * | Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Junio C Hamano2009-09-151-14/+35
| |\ \ | | |/
| | * diff.c: emit_add_line() takes only the rest of the lineJunio C Hamano2009-09-151-7/+9
| | * diff.c: split emit_line() from the first char and the rest of the lineJunio C Hamano2009-09-151-7/+26
| * | Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Junio C Hamano2009-09-151-148/+148
| |\ \ | | |/
| | * diff.c: shuffling code aroundJunio C Hamano2009-09-141-125/+125
| * | Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Junio C Hamano2009-09-158-70/+288
| |\ \ | | |/
| | * diff --whitespace: fix blank lines at endJunio C Hamano2009-09-142-22/+54
| | * core.whitespace: split trailing-space into blank-at-{eol,eof}Junio C Hamano2009-09-053-12/+21
| | * diff --color: color blank-at-eofJunio C Hamano2009-09-042-10/+36
| | * diff --whitespace=warn/error: fix blank-at-eof checkJunio C Hamano2009-09-042-16/+55
| | * diff --whitespace=warn/error: obey blank-at-eofJunio C Hamano2009-09-043-6/+10
| | * diff.c: the builtin_diff() deals with only two-file comparisonJunio C Hamano2009-09-041-23/+9
| | * apply --whitespace: warn blank but not necessarily empty lines at EOFJunio C Hamano2009-09-042-2/+17
| | * apply --whitespace=warn/error: diagnose blank at EOFJunio C Hamano2009-09-045-10/+54
| | * apply.c: split check_whitespace() into twoJunio C Hamano2009-09-041-9/+15
| | * apply --whitespace=fix: detect new blank lines at eof correctlyJunio C Hamano2009-09-042-0/+30
| | * apply --whitespace=fix: fix handling of blank lines at the eofJunio C Hamano2009-09-042-1/+30
* | | Merge branch 'maint'Junio C Hamano2009-10-174-1/+88
|\ \ \
| * | | GIT 1.6.5.1v1.6.5.1Junio C Hamano2009-10-164-2/+23
| * | | Merge branch 'maint-1.6.4' into maintJunio C Hamano2009-10-162-1/+67
| |\ \ \
| | * | | grep: do not segfault when -f is usedMatt Kraai2009-10-162-1/+67
* | | | | Merge branch 'pv/maint-add-p-no-exclude'Junio C Hamano2009-10-142-1/+15
|\ \ \ \ \
| * | | | | git-add--interactive: never skip files included in indexPauli Virtanen2009-10-102-1/+15
* | | | | | Merge branch 'maint'Junio C Hamano2009-10-142-0/+13
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | sha1_file: Fix infinite loop when pack is corruptedShawn O. Pearce2009-10-142-0/+13
* | | | | | Merge branch 'maint'Junio C Hamano2009-10-143-2/+11
|\ \ \ \ \ \ | |/ / / / /
| * | | | | change throughput display units with fast linksNicolas Pitre2009-10-141-1/+7
| * | | | | clone: Supply the right commit hash to post-checkout when -b is usedBjörn Steinbrink2009-10-142-1/+3
| * | | | | remote-curl: add missing initialization of argv0_pathJohannes Sixt2009-10-131-0/+1
* | | | | | Merge branch 'maint'Junio C Hamano2009-10-131-1/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'maint-1.6.4' into maintJunio C Hamano2009-10-131-1/+2
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | git-stash documentation: mention default options for 'list'Miklos Vajna2009-10-121-1/+2
| | |/ / /
* | | | | Let --decorate show HEAD positionThomas Rast2009-10-123-2/+3
* | | | | bash completion: complete refs for git-grepThomas Rast2009-10-121-1/+2
* | | | | diff.c: stylefixFelipe Contreras2009-10-111-1/+1
* | | | | Documentation: add 'git replace' to main git manpageSZEDER Gábor2009-10-111-0/+1
|/ / / /
* | | | GIT 1.6.5v1.6.5Junio C Hamano2009-10-103-7/+6
* | | | git-svn: hide find_parent_branch output in double quiet modeSimon Arlott2009-10-101-7/+12
* | | | Documentation: clone: clarify discussion of initial branchJonathan Nieder2009-10-091-2/+3
* | | | Merge branch 'rs/maint-archive-prefix'Junio C Hamano2009-10-092-3/+16
|\ \ \ \
View Lorry Controller Status