Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Makefile: whitespace style fixes in macro definitions | Stefano Lattarini | 2012-12-10 | 1 | -1/+1 |
* | Merge branch 'rr/t4041-cleanup' | Junio C Hamano | 2012-12-07 | 1 | -249/+248 |
|\ | |||||
| * | t4041 (diff-submodule-option): modernize style | Ramkumar Ramachandra | 2012-12-02 | 1 | -230/+229 |
| * | t4041 (diff-submodule-option): rewrite add_file() routine | Ramkumar Ramachandra | 2012-12-02 | 1 | -12/+12 |
| * | t4041 (diff-submodule-option): parse digests sensibly | Ramkumar Ramachandra | 2012-12-02 | 1 | -7/+7 |
| * | t4041 (diff-submodule-option): don't hardcode SHA-1 in expected outputs | Ramkumar Ramachandra | 2012-11-27 | 1 | -5/+5 |
* | | Merge branch 'pw/p4-various-fixes' | Junio C Hamano | 2012-11-29 | 2 | -1/+59 |
|\ \ | |||||
| * | | git p4 test: display unresolvable host error | Pete Wyckoff | 2012-11-26 | 1 | -0/+12 |
| * | | git p4: catch p4 errors when streaming file contents | Pete Wyckoff | 2012-11-26 | 1 | -1/+12 |
| * | | git p4: handle servers without move support | Pete Wyckoff | 2012-11-26 | 1 | -0/+35 |
| |/ | |||||
* | | Merge branch 'lt/diff-stat-show-0-lines' | Junio C Hamano | 2012-11-29 | 1 | -3/+45 |
|\ \ | |||||
| * | | t4049: refocus tests | Junio C Hamano | 2012-11-29 | 1 | -11/+9 |
| * | | diff --stat: do not count "unmerged" entries | Junio C Hamano | 2012-11-27 | 1 | -1/+1 |
| * | | diff --stat: move the "total count" logic to the last loop | Junio C Hamano | 2012-11-27 | 1 | -1/+1 |
| * | | test: add failing tests for "diff --stat" to t4049 | Junio C Hamano | 2012-11-27 | 1 | -1/+45 |
* | | | Merge branch 'fc/remote-hg' | Junio C Hamano | 2012-11-29 | 1 | -1/+2 |
|\ \ \ | |||||
| * | | | test-lib: avoid full path to store test results | Felipe Contreras | 2012-11-04 | 1 | -1/+2 |
* | | | | Merge branch 'jk/send-email-sender-prompt' | Junio C Hamano | 2012-11-29 | 6 | -12/+136 |
|\ \ \ \ | |||||
| * | | | | t9001: check send-email behavior with implicit sender | Jeff King | 2012-11-28 | 1 | -0/+28 |
| * | | | | Merge branch 'fc/send-email-no-sender-prompt' into jk/send-email-sender-prompt | Junio C Hamano | 2012-11-28 | 1 | -3/+2 |
| |\ \ \ \ | |||||
| * | | | | | t: add tests for "git var" | Jeff King | 2012-11-28 | 1 | -0/+49 |
| * | | | | | t7502: factor out autoident prerequisite | Jeff King | 2012-11-15 | 2 | -11/+7 |
| * | | | | | test-lib: allow negation of prerequisites | Jeff King | 2012-11-15 | 2 | -1/+52 |
* | | | | | | Merge branch 'fc/send-email-no-sender-prompt' | Junio C Hamano | 2012-11-29 | 1 | -3/+2 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | send-email: avoid questions when user has an ident | Felipe Contreras | 2012-11-26 | 1 | -3/+2 |
| |/ / / / | |||||
* | | | | | Merge branch 'jl/submodule-rm' | Junio C Hamano | 2012-11-29 | 1 | -0/+17 |
|\ \ \ \ \ | |||||
| * | | | | | Teach rm to remove submodules when given with a trailing '/' | Jens Lehmann | 2012-11-23 | 1 | -0/+17 |
* | | | | | | Merge branch 'fc/completion-test-simplification' | Junio C Hamano | 2012-11-29 | 1 | -82/+52 |
|\ \ \ \ \ \ | |||||
| * | | | | | | completion: simplify __gitcomp() test helper | Felipe Contreras | 2012-11-16 | 1 | -10/+5 |
| * | | | | | | completion: refactor __gitcomp related tests | Felipe Contreras | 2012-11-16 | 1 | -50/+28 |
| * | | | | | | completion: consolidate test_completion*() tests | Felipe Contreras | 2012-11-16 | 1 | -17/+14 |
| * | | | | | | completion: simplify tests using test_completion_long() | Felipe Contreras | 2012-11-16 | 1 | -6/+3 |
| * | | | | | | completion: standardize final space marker in tests | Felipe Contreras | 2012-11-16 | 1 | -14/+13 |
| * | | | | | | completion: add comment for test_completion() | Felipe Contreras | 2012-11-16 | 1 | -1/+5 |
* | | | | | | | Merge branch 'mm/status-push-pull-advise' | Junio C Hamano | 2012-11-28 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | status: add advice on how to push/pull to tracking branch | Matthieu Moy | 2012-11-16 | 1 | -0/+1 |
* | | | | | | | | Merge branch 'jk/pickaxe-textconv' | Junio C Hamano | 2012-11-28 | 1 | -0/+12 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | pickaxe: use textconv for -S counting | Jeff King | 2012-10-28 | 1 | -0/+12 |
* | | | | | | | | Merge branch 'rr/submodule-diff-config' | Junio C Hamano | 2012-11-25 | 1 | -1/+43 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | diff: rename "set" variable | Jeff King | 2012-11-18 | 1 | -0/+15 |
| * | | | | | | | | diff: introduce diff.submodule configuration variable | Ramkumar Ramachandra | 2012-11-18 | 1 | -1/+28 |
* | | | | | | | | | Merge branch 'jh/update-ref-d-through-symref' | Junio C Hamano | 2012-11-25 | 1 | -0/+18 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix failure to delete a packed ref through a symref | Johan Herland | 2012-10-21 | 1 | -1/+1 |
| * | | | | | | | | | t1400-update-ref: Add test verifying bug with symrefs in delete_ref() | Johan Herland | 2012-10-21 | 1 | -0/+18 |
* | | | | | | | | | | Merge branch 'lt/diff-stat-show-0-lines' | Junio C Hamano | 2012-11-25 | 3 | -26/+27 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| * | | | | | | | | | Fix "git diff --stat" for interesting - but empty - file changes | Linus Torvalds | 2012-10-17 | 3 | -26/+27 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jk/config-ignore-duplicates' | Junio C Hamano | 2012-11-21 | 2 | -131/+188 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | git-config: do not complain about duplicate entries | Jeff King | 2012-10-24 | 2 | -4/+5 |
| * | | | | | | | | | t1300: test "git config --get-all" more thoroughly | Jeff King | 2012-10-24 | 1 | -2/+7 |
| * | | | | | | | | | t1300: remove redundant test | Jeff King | 2012-10-24 | 1 | -4/+0 |