summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/cache-tree-api-refactor'Junio C Hamano2012-02-121-2/+2
|\
| * cache-tree: update API to take abitrary flagsnd/cache-tree-api-refactorNguyễn Thái Ngọc Duy2012-02-071-2/+2
* | Merge branch 'jk/maint-tag-show-fixes'Junio C Hamano2012-02-121-32/+40
|\ \
| * | tag: do not show non-tag contents with "-n"jk/maint-tag-show-fixesJunio C Hamano2012-02-081-10/+12
| * | tag: die when listing missing or corrupt objectsJeff King2012-02-061-1/+5
| * | tag: fix output of "tag -n" when errors occurJeff King2012-02-061-32/+34
* | | Merge branch 'jn/merge-no-edit-fix'Junio C Hamano2012-02-121-1/+2
|\ \ \
| * | | merge: do not launch an editor on "--no-edit $tag"jn/merge-no-edit-fixJunio C Hamano2012-02-091-3/+7
* | | | Merge branch 'js/add-e-submodule-fix'Junio C Hamano2012-02-101-0/+1
|\ \ \ \
| * | | | add -e: do not show difference in a submodule that is merely dirtyjs/add-e-submodule-fixJohannes Schindelin2012-02-071-0/+1
| | |/ / | |/| |
* | | | Merge branch 'jc/parse-date-raw'Junio C Hamano2012-02-101-0/+6
|\ \ \ \
| * | | | parse_date(): '@' prefix forces git-timestampjc/parse-date-rawJunio C Hamano2012-02-031-0/+6
* | | | | Merge branch 'jc/merge-ff-only-stronger-than-signed-merge'Junio C Hamano2012-02-101-1/+2
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | merge: do not create a signed tag merge under --ff-only optionjc/merge-ff-only-stronger-than-signed-mergeJunio C Hamano2012-02-051-1/+2
| | |_|/ | |/| |
* | | | Merge branch 'jc/branch-desc-typoavoidance'Junio C Hamano2012-02-101-0/+15
|\ \ \ \
| * | | | branch --edit-description: protect against mistyped branch namejc/branch-desc-typoavoidanceJunio C Hamano2012-02-051-0/+15
| |/ / /
* | | | Merge branch 'jx/i18n-more-marking'Junio C Hamano2012-02-071-3/+3
|\ \ \ \
| * | | | i18n: git-commit whence_s "merge/cherry-pick" messageJiang Xin2012-02-011-3/+3
| |/ / /
* | | | Merge branch 'tr/merge-edit-guidance'Junio C Hamano2012-01-311-0/+10
|\ \ \ \
| * | | | merge: add instructions to the commit message when editingtr/merge-edit-guidanceThomas Rast2012-01-311-0/+10
| |/ / /
* | | | Merge branch 'jc/pull-signed-tag'Junio C Hamano2012-01-311-4/+34
|\ \ \ \
| * | | | merge: use editor by default in interactive sessionsJunio C Hamano2012-01-231-4/+34
* | | | | Merge branch 'nd/clone-detached'Junio C Hamano2012-01-312-140/+183
|\ \ \ \ \
| * | | | | clone: fix up delay cloning conditionsNguyễn Thái Ngọc Duy2012-01-242-8/+14
| * | | | | push: do not let configured foreign-vcs permanently clobberedJunio C Hamano2012-01-231-0/+2
| * | | | | clone: print advice on checking out detached HEADNguyễn Thái Ngọc Duy2012-01-162-16/+5
| * | | | | clone: allow --branch to take a tagNguyễn Thái Ngọc Duy2012-01-161-1/+19
| * | | | | clone: refuse to clone if --branch points to bogus refNguyễn Thái Ngọc Duy2012-01-161-8/+4
| * | | | | clone: --branch=<branch> always means refs/heads/<branch>Nguyễn Thái Ngọc Duy2012-01-161-14/+16
| * | | | | clone: delay cloning until after remote HEAD checkingNguyễn Thái Ngọc Duy2012-01-161-27/+27
| * | | | | clone: factor out remote ref writingNguyễn Thái Ngọc Duy2012-01-161-14/+25
| * | | | | clone: factor out HEAD update codeNguyễn Thái Ngọc Duy2012-01-161-17/+24
| * | | | | clone: factor out checkout codeNguyễn Thái Ngọc Duy2012-01-161-43/+58
| * | | | | clone: write detached HEAD in bare repositoriesNguyễn Thái Ngọc Duy2012-01-161-6/+3
* | | | | | Merge branch 'tr/grep-l-with-decoration'Junio C Hamano2012-01-311-2/+3
|\ \ \ \ \ \
| * | | | | | grep: fix -l/-L interaction with decoration linestr/grep-l-with-decorationAlbert Yale2012-01-231-2/+3
* | | | | | | Merge branch 'rr/sequencer'Junio C Hamano2012-01-311-946/+7
|\ \ \ \ \ \ \
| * | | | | | | sequencer: factor code out of revert builtinrr/sequencerRamkumar Ramachandra2012-01-111-946/+2
| * | | | | | | revert: prepare to move replay_action to headerRamkumar Ramachandra2012-01-111-18/+22
* | | | | | | | Merge branch 'jc/advise-i18n'Junio C Hamano2012-01-311-5/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | i18n of multi-line advice messagesjc/advise-i18nJunio C Hamano2011-12-221-5/+4
* | | | | | | | | Merge branch 'nd/index-pack-no-recurse'Junio C Hamano2012-01-291-50/+114
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | index-pack: eliminate unlimited recursion in get_base_data()Nguyễn Thái Ngọc Duy2012-01-161-9/+44
| * | | | | | | | | index-pack: eliminate recursion in find_unresolved_deltasNguyễn Thái Ngọc Duy2012-01-161-41/+70
* | | | | | | | | | Merge branch 'mh/ref-clone-without-extra-refs'Junio C Hamano2012-01-291-2/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | write_remote_refs(): create packed (rather than extra) refsmh/ref-clone-without-extra-refsMichael Haggerty2012-01-171-2/+1
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'tr/maint-mailinfo'Junio C Hamano2012-01-291-1/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | mailinfo: with -b, keep space after [foo]tr/maint-mailinfoThomas Rast2012-01-161-1/+10
* | | | | | | | | | | Merge branch 'nd/maint-refname-in-hierarchy-check'Junio C Hamano2012-01-292-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix incorrect ref namespace checknd/maint-refname-in-hierarchy-checkNguyễn Thái Ngọc Duy2012-01-112-2/+2
View Lorry Controller Status