summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | submodule: preserve all arguments exactly when recursingKevin Ballard2010-11-032-4/+20
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/missing-config'Junio C Hamano2010-11-182-3/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | config: treat non-existent config files as emptyJeff King2010-10-222-3/+30
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'kb/maint-diff-ws-check'Junio C Hamano2010-11-184-47/+118
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | diff: handle lines containing only whitespace and tabs betterKevin Ballard2010-10-212-3/+41
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | test-lib: extend test_decode_color to handle more color codesKevin Ballard2010-10-212-44/+77
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bg/maint-gitweb-test-lib'Junio C Hamano2010-11-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | t/gitweb-lib: Don't pass constant to decode_utf8Brian Gernhardt2010-10-201-1/+1
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jm/mailmap'Junio C Hamano2010-11-182-16/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | t4203: do not let "git shortlog" DWIM based on ttyJunio C Hamano2010-10-201-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | t4203 (mailmap): stop hardcoding commit ids and datesJonathan Nieder2010-10-191-9/+17
| * | | | | | | | | | | | | | | | | | | | | | | | | | | mailmap: fix use of freed memoryJim Meyering2010-10-142-7/+44
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tr/maint-git-repack-tmpfile'Junio C Hamano2010-11-181-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | repack: place temporary packs under .git/objects/pack/Thomas Rast2010-10-191-2/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/maint-apply-no-binary'Junio C Hamano2010-11-182-1/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | apply: don't segfault on binary files with missing dataJeff King2010-10-292-1/+32
| |/ / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/push-progress'Junio C Hamano2010-11-188-51/+112
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | push: pass --progress down to git-pack-objectsJeff King2010-10-194-2/+7
| * | | | | | | | | | | | | | | | | | | | | | | | | | | t5523-push-upstream: test progress messagesTay Ray Chuan2010-10-191-0/+38
| * | | | | | | | | | | | | | | | | | | | | | | | | | | t5523-push-upstream: add function to ensure fresh upstream repoTay Ray Chuan2010-10-191-1/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | | | test_terminal: ensure redirections work reliablyJonathan Nieder2010-10-191-28/+10
| * | | | | | | | | | | | | | | | | | | | | | | | | | | test_terminal: catch use without TTY prerequisiteJonathan Nieder2010-10-192-8/+12
| * | | | | | | | | | | | | | | | | | | | | | | | | | | test-lib: allow test code to check the list of declared prerequisitesJonathan Nieder2010-10-191-7/+19
| * | | | | | | | | | | | | | | | | | | | | | | | | | | tests: test terminal output to both stdout and stderrJeff King2010-10-192-11/+28
| * | | | | | | | | | | | | | | | | | | | | | | | | | | tests: factor out terminal handling from t7006Jeff King2010-10-193-30/+29
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tr/maint-merge-file-subdir'Junio C Hamano2010-11-183-3/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-file: correctly find files when called in subdirThomas Rast2010-10-192-1/+14
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | prefix_filename(): safely handle the case where pfx_len=0Thomas Rast2010-10-191-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/send-pack-error'Junio C Hamano2010-11-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | send-pack: avoid redundant "pack-objects died with strange error"Jonathan Nieder2010-10-191-1/+1
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mg/make-prove'Junio C Hamano2010-11-182-1/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | test: allow running the tests under "prove"Michael J Gruber2010-10-262-1/+15
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'kb/completion-checkout'Junio C Hamano2010-11-181-3/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | completion: Support the DWIM mode for git checkoutKevin Ballard2010-10-141-3/+27
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sg/completion'Junio C Hamano2010-11-181-15/+64
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | bash: support pretty format aliasesSZEDER Gábor2010-10-141-4/+17
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | bash: support more 'git notes' subcommands and their optionsSZEDER Gábor2010-10-141-9/+41
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | bash: not all 'git bisect' subcommands make sense when not bisectingSZEDER Gábor2010-10-141-1/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | bash: offer refs for 'git bisect start'SZEDER Gábor2010-10-141-1/+1
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sg/bisect'Junio C Hamano2010-11-181-2/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | bisect: check for mandatory argument of 'bisect replay'SZEDER Gábor2010-10-141-0/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | bisect: improve error msg of 'bisect reset' when original HEAD is deletedSZEDER Gábor2010-10-141-1/+6
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | bisect: improve error message of 'bisect log' while not bisectingSZEDER Gábor2010-10-141-1/+5
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ak/submodule-sync'Junio C Hamano2010-11-172-3/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | submodule sync: Update "submodule.<name>.url" for empty directoriesAndreas Köhler2010-10-142-3/+14
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/maint-rev-list-nul'Junio C Hamano2010-11-174-6/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | rev-list: handle %x00 NUL in user formatJeff King2010-10-144-6/+16
| |/ / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ks/no-textconv-symlink'Junio C Hamano2010-11-176-25/+114
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''Kirill Smelkov2010-09-306-21/+30
| * | | | | | | | | | | | | | | | | | | | | | | | | | | blame,cat-file: Demonstrate --textconv is wrongly running converter on symlinksKirill Smelkov2010-09-302-0/+78