Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | diff: do not use null sha1 as a sentinel value | Jeff King | 2012-07-30 | 3 | -7/+12 |
* | Merge branch 'jc/maint-merge-autoedit' into maint | Junio C Hamano | 2012-04-02 | 1 | -1/+28 |
|\ | |||||
| * | merge: backport GIT_MERGE_AUTOEDIT support | Junio C Hamano | 2012-03-20 | 1 | -1/+28 |
* | | Merge branch 'maint-1.7.8' into maint | Junio C Hamano | 2012-03-20 | 1 | -5/+4 |
|\ \ | |/ |/| | |||||
| * | Merge branch 'jc/advise-i18n' into maint-1.7.8 | Junio C Hamano | 2012-03-20 | 1 | -5/+4 |
| |\ | |||||
| | * | i18n of multi-line advice messages | Junio C Hamano | 2011-12-22 | 1 | -5/+4 |
* | | | Merge branch 'cn/maint-branch-with-bad' into maint | Junio C Hamano | 2012-03-05 | 1 | -0/+4 |
|\ \ \ | |||||
| * | | | branch: don't assume the merge filter ref exists | Carlos Martín Nieto | 2012-02-27 | 1 | -0/+4 |
| |/ / | |||||
* | | | Merge branch 'nd/maint-verify-objects' into maint | Junio C Hamano | 2012-03-05 | 1 | -22/+16 |
|\ \ \ | |||||
| * | | | rev-list: fix --verify-objects --quiet becoming --objects | Nguyễn Thái Ngọc Duy | 2012-02-28 | 1 | -11/+15 |
| * | | | rev-list: remove BISECT_SHOW_TRIED flag | Nguyễn Thái Ngọc Duy | 2012-02-28 | 1 | -11/+1 |
* | | | | Merge branch 'pj/remote-set-branches-usage-fix' into maint | Junio C Hamano | 2012-02-28 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | remote: fix set-branches usage and documentation | Philip Jägenstedt | 2012-02-20 | 1 | -1/+1 |
* | | | | | Merge branch 'tr/merge-edit-guidance' into maint | Junio C Hamano | 2012-02-28 | 1 | -0/+10 |
|\ \ \ \ \ | |||||
| * | | | | | merge: add instructions to the commit message when editing | Thomas Rast | 2012-01-31 | 1 | -0/+10 |
* | | | | | | Merge branch 'cb/receive-pack-keep-errors' into maint | Junio C Hamano | 2012-02-22 | 1 | -7/+17 |
|\ \ \ \ \ \ | |||||
| * | | | | | | do not override receive-pack errors | Clemens Buchacher | 2012-02-13 | 1 | -7/+17 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'cb/transfer-no-progress' into maint | Junio C Hamano | 2012-02-22 | 5 | -16/+18 |
|\ \ \ \ \ \ | |||||
| * | | | | | | push/fetch/clone --no-progress suppresses progress output | Clemens Buchacher | 2012-02-13 | 5 | -16/+18 |
* | | | | | | | Merge branch 'jk/git-dir-lookup' into maint | Junio C Hamano | 2012-02-22 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | standardize and improve lookup rules for external local repos | Jeff King | 2012-02-03 | 1 | -2/+2 |
* | | | | | | | | Merge branch 'cb/maint-rev-list-verify-object' into maint | Junio C Hamano | 2012-02-21 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | git rev-list: fix invalid typecast | Clemens Buchacher | 2012-02-13 | 1 | -2/+2 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jk/grep-binary-attribute' into maint | Junio C Hamano | 2012-02-21 | 1 | -144/+33 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | grep: pre-load userdiff drivers when threaded | Jeff King | 2012-02-02 | 1 | -4/+6 |
| * | | | | | | | convert git-grep to use grep_source interface | Jeff King | 2012-02-02 | 1 | -119/+23 |
| * | | | | | | | grep: move sha1-reading mutex into low-level code | Jeff King | 2012-02-02 | 1 | -23/+6 |
| * | | | | | | | grep: make locking flag global | Jeff King | 2012-02-02 | 1 | -2/+2 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'nd/diffstat-gramnum' into maint | Junio C Hamano | 2012-02-21 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Use correct grammar in diffstat summary line | Nguyễn Thái Ngọc Duy | 2012-02-04 | 1 | -1/+2 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'jc/checkout-out-of-unborn' into maint | Junio C Hamano | 2012-02-16 | 1 | -0/+19 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git checkout -b: allow switching out of an unborn branch | Junio C Hamano | 2012-02-07 | 1 | -0/+19 |
* | | | | | | | | Merge branch 'jx/i18n-more-marking' into maint | Junio C Hamano | 2012-02-16 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | i18n: git-commit whence_s "merge/cherry-pick" message | Jiang Xin | 2012-02-02 | 1 | -3/+3 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jk/maint-tag-show-fixes' into maint | Junio C Hamano | 2012-02-14 | 1 | -32/+40 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | tag: do not show non-tag contents with "-n" | Junio C Hamano | 2012-02-09 | 1 | -10/+12 |
| * | | | | | | | | tag: die when listing missing or corrupt objects | Jeff King | 2012-02-06 | 1 | -1/+5 |
| * | | | | | | | | tag: fix output of "tag -n" when errors occur | Jeff King | 2012-02-06 | 1 | -32/+34 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jn/merge-no-edit-fix' into maint | Junio C Hamano | 2012-02-14 | 1 | -3/+7 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | merge: do not launch an editor on "--no-edit $tag" | Junio C Hamano | 2012-02-09 | 1 | -3/+7 |
* | | | | | | | | Merge branch 'js/add-e-submodule-fix' into maint | Junio C Hamano | 2012-02-13 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | add -e: do not show difference in a submodule that is merely dirty | Johannes Schindelin | 2012-02-07 | 1 | -0/+1 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jc/parse-date-raw' into maint | Junio C Hamano | 2012-02-13 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | parse_date(): '@' prefix forces git-timestamp | Junio C Hamano | 2012-02-04 | 1 | -0/+6 |
* | | | | | | | | | Merge branch 'jc/merge-ff-only-stronger-than-signed-merge' into maint | Junio C Hamano | 2012-02-13 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | merge: do not create a signed tag merge under --ff-only option | Junio C Hamano | 2012-02-06 | 1 | -1/+2 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jc/branch-desc-typoavoidance' into maint | Junio C Hamano | 2012-02-13 | 1 | -0/+15 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | branch --edit-description: protect against mistyped branch name | Junio C Hamano | 2012-02-06 | 1 | -0/+15 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'tr/grep-l-with-decoration' into maint | Junio C Hamano | 2012-02-10 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | grep: fix -l/-L interaction with decoration lines | Albert Yale | 2012-01-23 | 1 | -2/+3 |