aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'jc/maint-merge-autoedit' into maintJunio C Hamano2012-04-02
|\
| * merge: backport GIT_MERGE_AUTOEDIT supportJunio C Hamano2012-03-20
* | Merge branch 'maint-1.7.8' into maintJunio C Hamano2012-03-20
|\ \ | |/ |/|
| * Merge branch 'jc/advise-i18n' into maint-1.7.8Junio C Hamano2012-03-20
| |\
| | * i18n of multi-line advice messagesJunio C Hamano2011-12-22
* | | Merge branch 'cn/maint-branch-with-bad' into maintJunio C Hamano2012-03-04
|\ \ \
| * | | branch: don't assume the merge filter ref existsCarlos Martín Nieto2012-02-27
| |/ /
* | | Merge branch 'nd/maint-verify-objects' into maintJunio C Hamano2012-03-04
|\ \ \
| * | | rev-list: fix --verify-objects --quiet becoming --objectsNguyễn Thái Ngọc Duy2012-02-28
| * | | rev-list: remove BISECT_SHOW_TRIED flagNguyễn Thái Ngọc Duy2012-02-28
* | | | Merge branch 'pj/remote-set-branches-usage-fix' into maintJunio C Hamano2012-02-27
|\ \ \ \
| * | | | remote: fix set-branches usage and documentationPhilip Jägenstedt2012-02-19
* | | | | Merge branch 'tr/merge-edit-guidance' into maintJunio C Hamano2012-02-27
|\ \ \ \ \
| * | | | | merge: add instructions to the commit message when editingThomas Rast2012-01-31
* | | | | | Merge branch 'cb/receive-pack-keep-errors' into maintJunio C Hamano2012-02-21
|\ \ \ \ \ \
| * | | | | | do not override receive-pack errorsClemens Buchacher2012-02-13
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'cb/transfer-no-progress' into maintJunio C Hamano2012-02-21
|\ \ \ \ \ \
| * | | | | | push/fetch/clone --no-progress suppresses progress outputClemens Buchacher2012-02-13
* | | | | | | Merge branch 'jk/git-dir-lookup' into maintJunio C Hamano2012-02-21
|\ \ \ \ \ \ \
| * | | | | | | standardize and improve lookup rules for external local reposJeff King2012-02-02
* | | | | | | | Merge branch 'cb/maint-rev-list-verify-object' into maintJunio C Hamano2012-02-21
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | git rev-list: fix invalid typecastClemens Buchacher2012-02-13
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'jk/grep-binary-attribute' into maintJunio C Hamano2012-02-21
|\ \ \ \ \ \ \
| * | | | | | | grep: pre-load userdiff drivers when threadedJeff King2012-02-02
| * | | | | | | convert git-grep to use grep_source interfaceJeff King2012-02-02
| * | | | | | | grep: move sha1-reading mutex into low-level codeJeff King2012-02-02
| * | | | | | | grep: make locking flag globalJeff King2012-02-02
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'nd/diffstat-gramnum' into maintJunio C Hamano2012-02-21
|\ \ \ \ \ \ \
| * | | | | | | Use correct grammar in diffstat summary lineNguyễn Thái Ngọc Duy2012-02-03
| |/ / / / / /
* | | | | | | Merge branch 'jc/checkout-out-of-unborn' into maintJunio C Hamano2012-02-16
|\ \ \ \ \ \ \
| * | | | | | | git checkout -b: allow switching out of an unborn branchJunio C Hamano2012-02-06
* | | | | | | | Merge branch 'jx/i18n-more-marking' into maintJunio C Hamano2012-02-16
|\ \ \ \ \ \ \ \
| * | | | | | | | i18n: git-commit whence_s "merge/cherry-pick" messageJiang Xin2012-02-01
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/maint-tag-show-fixes' into maintJunio C Hamano2012-02-13
|\ \ \ \ \ \ \ \
| * | | | | | | | tag: do not show non-tag contents with "-n"Junio C Hamano2012-02-08
| * | | | | | | | tag: die when listing missing or corrupt objectsJeff King2012-02-06
| * | | | | | | | tag: fix output of "tag -n" when errors occurJeff King2012-02-06
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jn/merge-no-edit-fix' into maintJunio C Hamano2012-02-13
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | merge: do not launch an editor on "--no-edit $tag"Junio C Hamano2012-02-09
* | | | | | | | Merge branch 'js/add-e-submodule-fix' into maintJunio C Hamano2012-02-13
|\ \ \ \ \ \ \ \
| * | | | | | | | add -e: do not show difference in a submodule that is merely dirtyJohannes Schindelin2012-02-07
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jc/parse-date-raw' into maintJunio C Hamano2012-02-13
|\ \ \ \ \ \ \ \
| * | | | | | | | parse_date(): '@' prefix forces git-timestampJunio C Hamano2012-02-03
* | | | | | | | | Merge branch 'jc/merge-ff-only-stronger-than-signed-merge' into maintJunio C Hamano2012-02-13
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | merge: do not create a signed tag merge under --ff-only optionJunio C Hamano2012-02-05
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jc/branch-desc-typoavoidance' into maintJunio C Hamano2012-02-13
|\ \ \ \ \ \ \ \
| * | | | | | | | branch --edit-description: protect against mistyped branch nameJunio C Hamano2012-02-05
| |/ / / / / / /
* | | | | | | | Merge branch 'tr/grep-l-with-decoration' into maintJunio C Hamano2012-02-10
|\ \ \ \ \ \ \ \
| * | | | | | | | grep: fix -l/-L interaction with decoration linesAlbert Yale2012-01-23
* | | | | | | | | Merge branch 'cb/push-quiet' into maintJunio C Hamano2012-02-05
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |