Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/git-connection-deadlock-fix' into maint-1.7.4 | Junio C Hamano | 2011-05-26 | 1 | -0/+2 |
* | Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' into maint-1.7.4 | Junio C Hamano | 2011-05-26 | 1 | -2/+7 |
* | Merge branch 'jc/index-update-if-able' into maint | Junio C Hamano | 2011-04-03 | 2 | -13/+3 |
|\ | |||||
| * | diff/status: refactor opportunistic index update | Junio C Hamano | 2011-03-21 | 2 | -13/+3 |
* | | Merge branch 'lt/default-abbrev' into maint | Junio C Hamano | 2011-04-03 | 1 | -1/+5 |
|\ \ | |||||
| * | | Make the default abbrev length configurable | Linus Torvalds | 2011-03-11 | 1 | -1/+5 |
* | | | Merge branch 'mm/maint-log-n-with-diff-filtering' into maint | Junio C Hamano | 2011-04-03 | 1 | -1/+7 |
|\ \ \ | |||||
| * | | | log: fix --max-count when used together with -S or -G | Matthieu Moy | 2011-03-09 | 1 | -1/+7 |
* | | | | Merge branch 'lp/config-vername-check' into maint | Junio C Hamano | 2011-04-03 | 1 | -7/+20 |
|\ \ \ \ | |||||
| * | | | | Sanity-check config variable names | Libor Pechacek | 2011-02-22 | 1 | -7/+20 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'jc/maint-apply-report-offset' into maint | Junio C Hamano | 2011-04-01 | 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' into maint | Junio C Hamano | 2011-04-01 | 1 | -1/+6 |
|\ \ \ \ | |||||
| * | | | | apply: do not patch lines that were already patched | Junio C Hamano | 2011-03-04 | 1 | -1/+6 |
| |/ / / | |||||
* | | | | Merge "checkout ambiguous ref bugfix" into maint | Junio C Hamano | 2011-04-01 | 1 | -10/+13 |
|\ \ \ \ | |||||
| * | | | | checkout: fix bug with ambiguous refs | Junio C Hamano | 2011-01-11 | 1 | -10/+13 |
* | | | | | grep: Add the option '--line-number' | Joe Ratterman | 2011-03-28 | 1 | -1/+1 |
* | | | | | Merge branch 'jn/maint-commit-missing-template' into maint | Junio C Hamano | 2011-03-16 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | commit: error out for missing commit message template | Jonathan Nieder | 2011-02-25 | 1 | -1/+1 |
| * | | | | | Merge branch 'ak/describe-exact' into maint | Junio C Hamano | 2011-01-19 | 1 | -25/+60 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | Merge branch 'lt/rename-no-extra-copy-detection' into maint | Junio C Hamano | 2011-03-16 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | for_each_hash: allow passing a 'void *data' pointer to callback | Linus Torvalds | 2011-02-18 | 1 | -2/+2 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jk/fail-null-clone' into maint | Junio C Hamano | 2011-03-16 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | clone: die when trying to clone missing local path | Jeff King | 2011-02-18 | 1 | -1/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'jh/push-default-upstream-configname' into maint | Junio C Hamano | 2011-03-16 | 1 | -5/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | push.default: Rename 'tracking' to 'upstream' | Johan Herland | 2011-02-16 | 1 | -5/+5 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'mg/placeholders-are-lowercase' into maint | Junio C Hamano | 2011-03-16 | 8 | -25/+25 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Make <identifier> lowercase as per CodingGuidelines | Michael J Gruber | 2011-02-15 | 8 | -25/+25 |
* | | | | | | | | Merge branch 'mg/patch-id' into maint | Junio C Hamano | 2011-03-16 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | git-patch-id: do not trip over "no newline" markers | Michael J Gruber | 2011-02-17 | 1 | -0/+2 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'js/maint-merge-use-prepare-commit-msg-hook' into maint | Junio C Hamano | 2011-03-16 | 1 | -8/+29 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | merge: honor prepare-commit-msg hook | Jay Soffian | 2011-02-15 | 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 |
| |_|_|_|_|/ / |/| | | | | | | |||||
* | | | | | | | init: remove unnecessary check | Nguyễn Thái Ngọc Duy | 2011-03-03 | 1 | -7/+5 |
* | | | | | | | branch_merged: fix grammar in warning | Eric Hanchrow | 2011-02-27 | 1 | -1/+1 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | commit,status: describe -u likewise | Michael J Gruber | 2011-02-15 | 1 | -1/+1 |
* | | | | | | add: describe --patch like checkout, reset | Michael J Gruber | 2011-02-15 | 1 | -1/+1 |
* | | | | | | commit,merge,tag: describe -m likewise | Michael J Gruber | 2011-02-15 | 3 | -5/+5 |
* | | | | | | clone,init: describe --template using the same wording | Michael J Gruber | 2011-02-15 | 2 | -3/+3 |
* | | | | | | commit,status: describe --porcelain just like push | Michael J Gruber | 2011-02-15 | 1 | -2/+2 |
* | | | | | | commit,tag: use same wording for -F | Michael J Gruber | 2011-02-15 | 2 | -2/+2 |
* | | | | | | correct type of EMPTY_TREE_SHA1_BIN | Jonathan Nieder | 2011-02-14 | 1 | -1/+1 |
* | | | | | | Merge branch 'jc/fsck-fixes' into maint | Junio C Hamano | 2011-02-11 | 1 | -9/+22 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fsck: do not give up too early in fsck_dir() | Junio C Hamano | 2011-01-27 | 1 | -6/+12 |
| * | | | | | | fsck: drop unused parameter from traverse_one_object() | Junio C Hamano | 2011-01-27 | 1 | -3/+10 |
| |/ / / / / | |||||
* | | | | | | clone: fixup recurse_submodules option | Chris Packham | 2011-02-11 | 1 | -1/+1 |
* | | | | | | diff: support --cached on unborn branches | Nguyễn Thái Ngọc Duy | 2011-02-07 | 1 | -2/+5 |
|/ / / / / | |||||
* | | | | | remote-ext: do not segfault for blank lines | Jonathan Nieder | 2011-01-18 | 1 | -4/+4 |