Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'lt/default-abbrev' | Junio C Hamano | 2011-03-23 | 1 | -1/+5 |
|\ | |||||
| * | Make the default abbrev length configurable | Linus Torvalds | 2011-03-11 | 1 | -1/+5 |
* | | Merge branch 'mg/rev-list-one-side-only' | Junio C Hamano | 2011-03-22 | 1 | -12/+2 |
|\ \ | |||||
| * | | rev-list/log: factor out revision mark generation | Michael J Gruber | 2011-03-09 | 1 | -12/+2 |
| |/ | |||||
* | | Merge branch 'jn/test-sanitize-git-env' | Junio C Hamano | 2011-03-22 | 1 | -1/+1 |
|\ \ | |||||
| * | | config: drop support for GIT_CONFIG_NOGLOBAL | Jonathan Nieder | 2011-03-15 | 1 | -1/+1 |
* | | | Merge branch 'sp/maint-fetch-pack-stop-early' | Junio C Hamano | 2011-03-22 | 1 | -2/+16 |
|\ \ \ | |||||
| * | | | fetch-pack: Implement no-done capability | Shawn O. Pearce | 2011-03-15 | 1 | -3/+15 |
| * | | | fetch-pack: Finish negotation if remote replies "ACK %s ready" | Shawn O. Pearce | 2011-03-14 | 1 | -0/+2 |
| | |/ | |/| | |||||
* | | | Merge branch 'jc/maint-fetch-alt' | Junio C Hamano | 2011-03-22 | 2 | -32/+15 |
|\ \ \ | |||||
| * | | | fetch-pack: objects in our alternates are available to us | Junio C Hamano | 2011-03-17 | 1 | -0/+12 |
| * | | | refs_from_alternate: helper to use refs from alternates | Junio C Hamano | 2011-03-17 | 1 | -32/+3 |
* | | | | Fix sparse warnings | Stephen Boyd | 2011-03-22 | 20 | -29/+22 |
* | | | | Merge branch 'mm/maint-log-n-with-diff-filtering' | Junio C Hamano | 2011-03-19 | 1 | -1/+7 |
|\ \ \ \ | |||||
| * | | | | log: fix --max-count when used together with -S or -G | Matthieu Moy | 2011-03-09 | 1 | -1/+7 |
| |/ / / | |||||
* | | | | Merge branch 'js/rerere-forget-always-take-pathspec' | Junio C Hamano | 2011-03-19 | 1 | -2/+5 |
|\ \ \ \ | |||||
| * | | | | rerere forget: deprecate invocation without pathspec | Johannes Sixt | 2011-03-02 | 1 | -2/+5 |
* | | | | | Merge branch 'uk/ls-remote-in-get-remote-url' | Junio C Hamano | 2011-03-19 | 1 | -0/+11 |
|\ \ \ \ \ | |||||
| * | | | | | get_remote_url(): use the same data source as ls-remote to get remote urls | Uwe Kleine-König | 2011-03-02 | 1 | -0/+11 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'jn/status-translatable' | Junio C Hamano | 2011-03-19 | 1 | -29/+30 |
|\ \ \ \ \ | |||||
| * | | | | | commit, status: use status_printf{,_ln,_more} helpers | Jonathan Nieder | 2011-03-08 | 1 | -23/+24 |
| * | | | | | commit: refer to commit template as s->fp | Jonathan Nieder | 2011-03-08 | 1 | -14/+13 |
* | | | | | | Merge branch 'jk/trace-sifter' | Junio C Hamano | 2011-03-19 | 5 | -0/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | add packet tracing debug code | Jeff King | 2011-03-08 | 5 | -0/+8 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'jk/merge-rename-ux' | Junio C Hamano | 2011-03-19 | 2 | -1/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | merge: enable progress reporting for rename detection | Jeff King | 2011-02-21 | 1 | -0/+7 |
| * | | | | | | commit: stop setting rename limit | Jeff King | 2011-02-21 | 1 | -1/+0 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | grep: read patterns from stdin with -f - | René Scharfe | 2011-03-19 | 1 | -2/+4 |
* | | | | | | Name make_*_path functions more accurately | Carlos Martín Nieto | 2011-03-17 | 3 | -10/+10 |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-03-16 | 6 | -47/+50 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jn/maint-commit-missing-template' into maint | Junio C Hamano | 2011-03-16 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'lt/rename-no-extra-copy-detection' into maint | Junio C Hamano | 2011-03-16 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jk/fail-null-clone' into maint | Junio C Hamano | 2011-03-16 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jh/push-default-upstream-configname' into maint | Junio C Hamano | 2011-03-16 | 1 | -5/+5 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'mg/placeholders-are-lowercase' into maint | Junio C Hamano | 2011-03-16 | 8 | -25/+25 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'mg/patch-id' into maint | Junio C Hamano | 2011-03-16 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/maint-merge-use-prepare-commit-msg-hook' into maint | Junio C Hamano | 2011-03-16 | 1 | -8/+29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | cherry: split off function to print output lines | Jonathan Nieder | 2011-03-16 | 1 | -16/+18 |
| * | | | | | | | | | | | | | branch: split off function that writes tracking info and commit subject | Jonathan Nieder | 2011-03-16 | 1 | -21/+27 |
| * | | | | | | | | | | | | | standardize brace placement in struct definitions | Jonathan Nieder | 2011-03-16 | 4 | -10/+5 |
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'mm/push-default-advice' | Junio C Hamano | 2011-03-15 | 1 | -7/+24 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | push: better error message when no remote configured | Matthieu Moy | 2011-03-02 | 1 | -1/+8 |
| * | | | | | | | | | | | | | push: better error messages when push.default = tracking | Matthieu Moy | 2011-03-02 | 1 | -6/+16 |
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'jc/checkout-orphan-warning' | Junio C Hamano | 2011-03-15 | 1 | -6/+95 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | commit: give final warning when reattaching HEAD to leave commits behind | Junio C Hamano | 2011-02-23 | 1 | -6/+95 |
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'jc/maint-apply-report-offset' | Junio C Hamano | 2011-03-15 | 1 | -2/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | apply -v: show offset count when patch did not apply exactly | Junio C Hamano | 2011-03-06 | 1 | -2/+14 |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'jc/maint-apply-no-double-patch' | Junio C Hamano | 2011-03-15 | 1 | -1/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | apply: do not patch lines that were already patched | Junio C Hamano | 2011-03-04 | 1 | -1/+6 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge branch 'js/cherry-pick-usability' | Junio C Hamano | 2011-03-09 | 3 | -95/+143 |
|\ \ \ \ \ \ \ \ \ \ \ \ |