Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | git credential fill: output the whole 'struct credential' | Matthieu Moy | 2012-06-25 | 2 | -0/+39 |
* | add 'git credential' plumbing command | Javier Roucher Iglesias | 2012-06-25 | 1 | -2/+12 |
* | Merge branch 'jk/maint-t1304-setfacl' | Junio C Hamano | 2012-06-21 | 1 | -10/+9 |
|\ | |||||
| * | t1304: improve setfacl prerequisite setup | Jeff King | 2012-06-07 | 1 | -10/+9 |
* | | Merge branch 'jk/clone-local' | Junio C Hamano | 2012-06-21 | 1 | -0/+10 |
|\ \ | |||||
| * | | clone: allow --no-local to turn off local optimizations | Jeff King | 2012-05-30 | 1 | -0/+10 |
* | | | Merge branch 'as/diff-shortstat-ignore-binary' | Junio C Hamano | 2012-06-15 | 1 | -0/+12 |
|\ \ \ | |||||
| * | | | diff: Only count lines in show_shortstats | Alexander Strasser | 2012-06-15 | 1 | -0/+12 |
* | | | | Merge branch 'rj/gitweb-test-sans-date-parser' | Junio C Hamano | 2012-06-13 | 1 | -7/+14 |
|\ \ \ \ | |||||
| * | | | | gitweb: Skip 'modification times' tests when no date parser available | Ramsay Jones | 2012-06-12 | 1 | -7/+14 |
* | | | | | Merge branch 'fc/git-complete-helper-fix' | Junio C Hamano | 2012-06-13 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | completion: put main git and gitk completion functions back into git namespace | SZEDER Gábor | 2012-06-13 | 1 | -1/+1 |
* | | | | | | Merge branch 'jc/fmt-merge-msg-people' | Junio C Hamano | 2012-06-12 | 1 | -18/+18 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fmt-merge-msg: make attribution into comment lines | Junio C Hamano | 2012-06-06 | 1 | -18/+18 |
* | | | | | | | Merge branch 'rr/maint-t3510-cascade-fix' | Junio C Hamano | 2012-06-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t3510 (cherry-pick-sequence): add missing '&&' | Ramkumar Ramachandra | 2012-06-04 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'ef/maint-rebase-error-message' | Junio C Hamano | 2012-06-01 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | rebase: report invalid commit correctly | Erik Faye-Lund | 2012-05-30 | 1 | -0/+5 |
* | | | | | | | | | Merge branch 'nh/empty-rebase' | Junio C Hamano | 2012-06-01 | 1 | -0/+30 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | |||||
| * | | | | | | | | cherry-pick: regression fix for empty commits | Junio C Hamano | 2012-05-29 | 1 | -0/+30 |
* | | | | | | | | | t5701: modernize style | Jeff King | 2012-05-29 | 1 | -53/+20 |
* | | | | | | | | | Merge branch 'va/git-p4-test' | Junio C Hamano | 2012-05-29 | 1 | -3/+107 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | git-p4: Clean up branch test cases | Vitor Antunes | 2012-05-29 | 1 | -3/+1 |
| * | | | | | | | | | git-p4: Verify detection of "empty" branch creation | Vitor Antunes | 2012-05-29 | 1 | -0/+54 |
| * | | | | | | | | | git-p4: Test changelists touching two branches | Vitor Antunes | 2012-05-29 | 1 | -0/+52 |
* | | | | | | | | | | Merge branch 'mh/test-keep-prove-cache' | Junio C Hamano | 2012-05-25 | 1 | -2/+4 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t/Makefile: retain cache t/.prove across prove runs | Michael Haggerty | 2012-05-20 | 1 | -2/+4 |
* | | | | | | | | | | | Merge branch 'fc/git-complete-helper-fix' | Junio C Hamano | 2012-05-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | completion: rename internal helpers _git and _gitk | Felipe Contreras | 2012-05-20 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'jk/ident-split-fix' | Junio C Hamano | 2012-05-25 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | fix off-by-one error in split_ident_line | Jeff King | 2012-05-22 | 1 | -0/+7 |
* | | | | | | | | | | | | Merge branch 'rs/maint-grep-F' | Junio C Hamano | 2012-05-25 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | grep: support newline separated pattern list | René Scharfe | 2012-05-20 | 1 | -0/+5 |
* | | | | | | | | | | | | | Merge branch 'js/rebase-i-p-test-fix' | Junio C Hamano | 2012-05-23 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Fix t3411.3 to actually rebase something | Johannes Sixt | 2012-05-18 | 1 | -0/+1 |
* | | | | | | | | | | | | | | Merge branch 'bp/diff-no-index-strbuf-fix' | Junio C Hamano | 2012-05-23 | 1 | -0/+19 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | diff --no-index: reset temporary buffer lengths on directory iteration | Bobby Powers | 2012-05-16 | 1 | -0/+19 |
* | | | | | | | | | | | | | | | Merge branch 'hv/submodule-alt-odb' | Junio C Hamano | 2012-05-23 | 1 | -0/+34 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | teach add_submodule_odb() to look for alternates | Heiko Voigt | 2012-05-14 | 1 | -0/+34 |
| |/ / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2012-05-20 | 3 | -3/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Consistently use "superproject" instead of "supermodule" | Jens Lehmann | 2012-05-20 | 2 | -3/+3 |
| * | | | | | | | | | | | | | | | t3404: begin "exchange commits with -p" test with correct preconditions | Johannes Sixt | 2012-05-20 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | | Merge branch 'jk/maint-reflog-walk-count-vs-time' into maint | Junio C Hamano | 2012-05-14 | 1 | -4/+57 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ef/checkout-empty' into maint | Junio C Hamano | 2012-05-14 | 1 | -0/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/maint-tformat-with-z' into maint | Junio C Hamano | 2012-05-14 | 1 | -0/+28 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/checkout-detach-count' into maint | Junio C Hamano | 2012-05-14 | 1 | -5/+16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ct/advise-push-default' into maint | Junio C Hamano | 2012-05-11 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/fast-import-test-9300' into maint | Junio C Hamano | 2012-05-11 | 1 | -34/+54 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/repack-no-explode-objects-from-old-pack' into maint | Junio C Hamano | 2012-05-11 | 1 | -0/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sl/test-wc-l-line-count' into maint | Junio C Hamano | 2012-05-11 | 19 | -74/+65 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |