Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log' into maint-1.7.11 | Junio C Hamano | 2012-09-14 | 1 | -1/+1 |
|\ | |||||
| * | log: fix --quiet synonym for -s | Jeff King | 2012-08-28 | 1 | -1/+1 |
* | | Merge branch 'jc/maint-ident-missing-human-name' into maint-1.7.11 | Junio C Hamano | 2012-09-14 | 1 | -1/+16 |
|\ \ | |||||
| * | | split_ident_line(): make best effort when parsing author/committer line | Junio C Hamano | 2012-08-31 | 1 | -1/+16 |
| |/ | |||||
* | | Merge branch 'jc/apply-binary-p0' into maint-1.7.11 | Junio C Hamano | 2012-09-12 | 1 | -25/+43 |
|\ \ | |||||
| * | | apply: compute patch->def_name correctly under -p0 | Junio C Hamano | 2012-08-24 | 1 | -25/+43 |
* | | | Merge branch 'jc/dotdot-is-parent-directory' into maint-1.7.11 | Junio C Hamano | 2012-09-12 | 1 | -2/+14 |
|\ \ \ | |||||
| * | | | specifying ranges: we did not mean to make ".." an empty set | Junio C Hamano | 2012-08-23 | 1 | -2/+14 |
* | | | | Merge branch 'kk/maint-for-each-ref-multi-sort' into maint-1.7.11 | Junio C Hamano | 2012-09-12 | 1 | -1/+3 |
|\ \ \ \ | |||||
| * | | | | for-each-ref: Fix sort with multiple keys | Kacper Kornet | 2012-08-21 | 1 | -1/+3 |
* | | | | | Merge branch 'jc/maint-config-exit-status' into maint-1.7.11 | Junio C Hamano | 2012-09-11 | 1 | -2/+6 |
|\ \ \ \ \ | |||||
| * | | | | | config: "git config baa" should exit with status 1 | Junio C Hamano | 2012-07-30 | 1 | -2/+6 |
* | | | | | | Merge branch 'tr/void-diff-setup-done' into maint-1.7.11 | Junio C Hamano | 2012-09-11 | 4 | -12/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | diff_setup_done(): return void | Thomas Rast | 2012-08-03 | 4 | -12/+6 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'pg/maint-apply-remove-unused-variable' into maint-1.7.11 | Junio C Hamano | 2012-09-11 | 1 | -1/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | apply: delete unused deflate_origlen from patch struct | Paul Gortmaker | 2012-08-05 | 1 | -1/+0 |
* | | | | | | | Merge branch 'bc/receive-pack-stdout-protection' into maint-1.7.11 | Junio C Hamano | 2012-09-10 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | receive-pack: do not leak output from auto-gc to standard output | Junio C Hamano | 2012-08-06 | 1 | -1/+2 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jk/maint-null-in-trees' into maint-1.7.11 | Junio C Hamano | 2012-09-10 | 3 | -7/+12 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | diff: do not use null sha1 as a sentinel value | Jeff King | 2012-07-29 | 3 | -7/+12 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'jk/maint-commit-check-committer-early' into maint-1.7.11 | Junio C Hamano | 2012-08-24 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | commit: check committer identity more strictly | Jeff King | 2012-07-23 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge branch 'jk/maint-checkout-orphan-check-fix' into maint | Junio C Hamano | 2012-08-06 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | checkout: don't confuse ref and object flags | Jeff King | 2012-07-25 | 1 | -1/+1 |
* | | | | | | Merge branch 'kk/maint-commit-tree' into maint | Junio C Hamano | 2012-07-30 | 1 | -3/+0 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'kk/maint-1.7.9-commit-tree' into kk/maint-commit-tree | Junio C Hamano | 2012-07-17 | 1 | -3/+0 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | commit-tree: resurrect command line parsing updates | Junio C Hamano | 2012-07-17 | 1 | -3/+0 |
* | | | | | | | | Merge branch 'ar/clone-honor-umask-at-top' into maint | Junio C Hamano | 2012-07-22 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | add: create ADD_EDIT.patch with mode 0666 | Jeff King | 2012-07-09 | 1 | -1/+1 |
| * | | | | | | | | Restore umasks influence on the permissions of work tree created by clone | Alex Riesen | 2012-07-09 | 1 | -1/+1 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'cw/amend-commit-without-message' into maint | Junio C Hamano | 2012-07-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Allow edit of empty message with commit --amend | Chris Webb | 2012-07-09 | 1 | -1/+1 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'jk/maint-commit-amend-only-no-paths' into maint | Junio C Hamano | 2012-07-22 | 1 | -1/+4 |
* | | | | | | | | Merge branch 'tr/maint-show-walk' into maint | Junio C Hamano | 2012-07-22 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | show: fix "range implies walking" | Junio C Hamano | 2012-06-19 | 1 | -0/+3 |
* | | | | | | | | | Merge branch 'js/fast-export-paths-with-spaces' into maint | Junio C Hamano | 2012-07-22 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | fast-export: quote paths with spaces | Jay Soffian | 2012-06-27 | 1 | -0/+2 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'cw/no-detaching-an-unborn' into maint | Junio C Hamano | 2012-07-22 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | git-checkout: disallow --detach on unborn branch | Chris Webb | 2012-06-26 | 1 | -0/+2 |
* | | | | | | | | | | Merge branch 'jc/maint-blame-unique-abbrev' into maint | Junio C Hamano | 2012-07-11 | 1 | -4/+21 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | blame: compute abbreviation width that ensures uniqueness | Junio C Hamano | 2012-07-02 | 1 | -4/+21 |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'rj/platform-pread-may-be-thread-unsafe' into maint | Junio C Hamano | 2012-07-11 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | index-pack: Disable threading on cygwin | Junio C Hamano | 2012-06-26 | 1 | -2/+2 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'nd/clone-single-fix' into maint | Junio C Hamano | 2012-07-11 | 1 | -2/+5 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | clone: fix ref selection in --single-branch --branch=xxx | Nguyễn Thái Ngọc Duy | 2012-06-22 | 1 | -2/+5 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'js/maint-fast-export-mark-error' into maint | Junio C Hamano | 2012-06-17 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'hv/submodule-update-nuke-submodules' into maint | Junio C Hamano | 2012-07-11 | 1 | -6/+0 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | update-index: allow overwriting existing submodule index entries | Heiko Voigt | 2012-06-11 | 1 | -6/+0 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'jk/diff-no-index-pager' into maint | Junio C Hamano | 2012-07-11 | 1 | -7/+17 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | fix pager.diff with diff --no-index | Jeff King | 2012-06-15 | 1 | -7/+17 |
| |/ / / / / / / / / |