summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | | | | Merge branch 'cb/push-quiet'Junio C Hamano2012-01-292-7/+25
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fix push --quiet: add 'quiet' capability to receive-packClemens Buchacher2012-01-082-5/+22
| * | | | | | | | | | server_supports(): parse feature list more carefullyJunio C Hamano2012-01-081-2/+3
* | | | | | | | | | | Merge branch 'nd/clone-single-branch'Junio C Hamano2012-01-291-4/+48
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | / / | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | clone: add --single-branch to fetch only one branchnd/clone-single-branchNguyễn Thái Ngọc Duy2012-01-081-4/+48
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2012-01-121-2/+7
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.7.7' into maintJunio C Hamano2012-01-121-2/+7
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2012-01-121-2/+7
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | thin-pack: try harder to use preferred base objects as baseJeff King2012-01-121-2/+7
* | | | | | | | | | | | | Merge branch 'mh/ref-api-less-extra-refs'Junio C Hamano2012-01-091-29/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | write_head_info(): handle "extra refs" locallymh/ref-api-less-extra-refsMichael Haggerty2012-01-061-4/+3
| * | | | | | | | | | | | show_ref(): remove unused "flag" and "cb_data" argumentsMichael Haggerty2012-01-061-5/+5
| * | | | | | | | | | | | receive-pack: move more work into write_head_info()Michael Haggerty2012-01-061-24/+18
* | | | | | | | | | | | | Merge branch 'jc/show-sig'Junio C Hamano2012-01-063-7/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | commit --amend -S: strip existing gpgsig headersJunio C Hamano2012-01-051-1/+2
| * | | | | | | | | | | | | Merge branch 'jc/signed-commit' and 'jc/pull-signed-tag'Junio C Hamano2012-01-053-6/+46
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |