Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ab/cvsserver' | Junio C Hamano | 2010-06-13 | 1 | -1/+15 |
|\ | |||||
| * | git-cvsserver: test for pserver authentication support | Ævar Arnfjörð Bjarmason | 2010-05-19 | 1 | -1/+15 |
* | | Merge branch 'mg/notes-dry-run' | Junio C Hamano | 2010-06-13 | 1 | -2/+46 |
|\ \ | |||||
| * | | notes: dry-run and verbose options for prune | Michael J Gruber | 2010-05-19 | 1 | -2/+46 |
* | | | Merge branch 'jn/fsck-ident' | Junio C Hamano | 2010-06-13 | 1 | -0/+8 |
|\ \ \ | |||||
| * | | | fsck: fix bogus commit header check | Jonathan Nieder | 2010-05-28 | 1 | -0/+8 |
* | | | | Merge branch 'ab/submodule-foreach-toplevel' | Junio C Hamano | 2010-06-13 | 1 | -3/+7 |
|\ \ \ \ | |||||
| * | | | | git-submodule foreach: Add $toplevel variable | Ævar Arnfjörð Bjarmason | 2010-05-25 | 1 | -3/+7 |
* | | | | | Merge branch 'rs/grep-binary' | Junio C Hamano | 2010-06-13 | 1 | -0/+102 |
|\ \ \ \ \ | |||||
| * | | | | | grep: support NUL chars in search strings for -F | René Scharfe | 2010-05-24 | 1 | -0/+30 |
| * | | | | | grep: use REG_STARTEND for all matching if available | René Scharfe | 2010-05-24 | 1 | -0/+10 |
| * | | | | | grep: continue case insensitive fixed string search after NUL chars | René Scharfe | 2010-05-24 | 1 | -0/+4 |
| * | | | | | grep: use memmem() for fixed string search | René Scharfe | 2010-05-24 | 1 | -0/+4 |
| * | | | | | grep: --name-only over binary | René Scharfe | 2010-05-24 | 1 | -0/+6 |
| * | | | | | grep: --count over binary | René Scharfe | 2010-05-24 | 1 | -0/+6 |
| * | | | | | grep: add test script for binary file handling | René Scharfe | 2010-05-24 | 1 | -0/+42 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'jn/gitweb-syntax-highlight' | Junio C Hamano | 2010-06-13 | 1 | -0/+29 |
|\ \ \ \ \ | |||||
| * | | | | | gitweb: Refactor syntax highlighting support | Jakub Narebski | 2010-05-03 | 1 | -0/+29 |
* | | | | | | Merge branch 'cb/assume-unchanged-fix' | Junio C Hamano | 2010-06-13 | 1 | -0/+24 |
|\ \ \ \ \ \ | |||||
| * | | | | | | do not overwrite files marked "assume unchanged" | Clemens Buchacher | 2010-05-01 | 1 | -0/+24 |
* | | | | | | | Merge branch 'jn/notes-doc' | Junio C Hamano | 2010-06-13 | 1 | -0/+38 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Documentation/notes: describe content of notes blobs | Jonathan Nieder | 2010-05-08 | 1 | -0/+38 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'wp/pretty-enhancement' | Junio C Hamano | 2010-06-13 | 1 | -0/+74 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | pretty: add aliases for pretty formats | Will Palmer | 2010-05-03 | 1 | -0/+74 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'ab/test-cleanup' | Junio C Hamano | 2010-06-13 | 5 | -5/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Turn setup code in t2007-checkout-symlink.sh into a test | Ævar Arnfjörð Bjarmason | 2010-05-07 | 1 | -2/+4 |
| * | | | | | | | Move t6000lib.sh to lib-* | Ævar Arnfjörð Bjarmason | 2010-05-07 | 4 | -3/+3 |
* | | | | | | | | Merge branch 'jn/maint-amend-missing-name' | Junio C Hamano | 2010-06-13 | 1 | -0/+46 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | commit --amend: cope with missing display name | Jonathan Nieder | 2010-05-04 | 1 | -0/+46 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-06-11 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t/README: document --root option | Thomas Rast | 2010-06-11 | 1 | -0/+6 |
* | | | | | | | | | merge-recursive: demonstrate an incorrect conflict with submodule | Johannes Sixt | 2010-06-11 | 1 | -0/+29 |
* | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-05-28 | 1 | -2/+10 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | get_cwd_relative(): do not misinterpret suffix as subdirectory | Clemens Buchacher | 2010-05-28 | 1 | -2/+10 |
* | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-05-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | / / / | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | t7502-commit: fix spelling | Tay Ray Chuan | 2010-05-25 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'by/log-follow' | Junio C Hamano | 2010-05-21 | 1 | -0/+56 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | tests: rename duplicate t4205 | Jeff King | 2010-05-10 | 1 | -0/+0 |
| * | | | | | | | | Make git log --follow find copies among unmodified files. | Bo Yang | 2010-05-07 | 1 | -0/+56 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'mg/advice-statushints' | Junio C Hamano | 2010-05-21 | 1 | -0/+45 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | wt-status: take advice.statusHints seriously | Michael J Gruber | 2010-05-06 | 1 | -1/+1 |
| * | | | | | | | | t7508: test advice.statusHints | Michael J Gruber | 2010-05-06 | 1 | -0/+45 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'cb/maint-stash-orphaned-file' | Junio C Hamano | 2010-05-21 | 1 | -0/+150 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | stash tests: stash can lose data in a file removed from the index | Charles Bailey | 2010-04-20 | 1 | -0/+150 |
* | | | | | | | | | Merge branch 'jn/maint-bundle' | Junio C Hamano | 2010-05-21 | 1 | -0/+16 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t5704 (bundle): add tests for bundle --stdin | Jonathan Nieder | 2010-04-19 | 1 | -0/+16 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'pb/patch-id-plus' | Junio C Hamano | 2010-05-21 | 1 | -0/+28 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | patch-id: Add support for mbox format | Paolo Bonzini | 2010-04-19 | 1 | -0/+28 |
* | | | | | | | | | | Merge branch 'st/remote-tags-no-tags' | Junio C Hamano | 2010-05-21 | 1 | -0/+63 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | remote add: add a --[no-]tags option | Samuel Tardieu | 2010-04-19 | 1 | -0/+63 |
| |/ / / / / / / / / |