summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)AuthorFilesLines
2012-01-12Merge branch 'maint'Junio C Hamano1-2/+7
2012-01-12Merge branch 'maint-1.7.7' into maintJunio C Hamano1-2/+7
2012-01-12Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano1-2/+7
2012-01-12thin-pack: try harder to use preferred base objects as baseJeff King1-2/+7
2012-01-09Merge branch 'mh/ref-api-less-extra-refs'Junio C Hamano1-29/+22
2012-01-06Merge branch 'jc/show-sig'Junio C Hamano3-7/+46
2012-01-06Merge branch 'jh/fetch-head-update'Junio C Hamano1-71/+83
2012-01-06write_head_info(): handle "extra refs" locallyMichael Haggerty1-4/+3
2012-01-06show_ref(): remove unused "flag" and "cb_data" argumentsMichael Haggerty1-5/+5
2012-01-06receive-pack: move more work into write_head_info()Michael Haggerty1-24/+18
2012-01-05commit --amend -S: strip existing gpgsig headersJunio C Hamano1-1/+2
2012-01-05Merge branch 'jc/signed-commit' and 'jc/pull-signed-tag'Junio C Hamano3-6/+46
2012-01-03write first for-merge ref to FETCH_HEAD firstJoey Hess1-71/+83
2011-12-28Sync with 1.7.8.2Junio C Hamano1-1/+1
2011-12-28Merge branch 'jv/maint-config-set' into maintJunio C Hamano1-1/+1
2011-12-28Merge branch 'jc/checkout-m-twoway' into maintJunio C Hamano1-23/+35
2011-12-28Merge branch 'jk/maint-strbuf-missing-init' into maintJunio C Hamano2-2/+2
2011-12-28Merge branch 'jn/maint-sequencer-fixes' into maintJunio C Hamano1-47/+91
2011-12-28Merge branch 'jk/maint-mv' into maintJunio C Hamano1-2/+4
2011-12-28Merge branch 'jk/fetch-no-tail-match-refs' into maintJunio C Hamano2-7/+11
2011-12-28Merge branch 'ci/stripspace-docs' into maintJunio C Hamano1-1/+1
2011-12-28Merge branch 'jn/branch-move-to-self' into maintJunio C Hamano2-6/+20
2011-12-27Fix an incorrect reference to --set-all.Jelmer Vernooij1-1/+1
2011-12-22Merge branch 'ab/sun-studio-portability'Junio C Hamano2-5/+5
2011-12-22Merge branch 'rr/revert-cherry-pick'Junio C Hamano1-23/+25
2011-12-22Merge branch 'jk/maint-strbuf-missing-init'Junio C Hamano2-2/+2
2011-12-22Merge branch 'rs/diff-tree-combined-clean-up'Junio C Hamano1-6/+6
2011-12-22Merge branch 'tr/grep-threading'Junio C Hamano1-15/+20
2011-12-22Merge branch 'nd/war-on-nul-in-commit'Junio C Hamano4-6/+8
2011-12-21Sync with v1.7.8.1Junio C Hamano3-5/+3
2011-12-21Merge branch 'bc/maint-apply-check-no-patch' into maintJunio C Hamano1-5/+5
2011-12-21clone: the -o option has nothing to do with <branch>Carlos Martín Nieto1-2/+2
2011-12-21builtin/log: remove redundant initializationMichael Schubert1-2/+0
2011-12-21Merge branch 'ms/commit-cc-option-helpstring' into maintJunio C Hamano1-1/+1
2011-12-21Appease Sun Studio by renaming "tmpfile"Ævar Arnfjörð Bjarmason1-3/+3
2011-12-21Fix an enum assignment issue spotted by Sun StudioÆvar Arnfjörð Bjarmason1-2/+2
2011-12-20Merge branch 'maint'Junio C Hamano1-1/+1
2011-12-20builtin/init-db.c: eliminate -Wformat warning on SolarisÆvar Arnfjörð Bjarmason1-1/+1
2011-12-20Merge branch 'jc/pull-signed-tag'Junio C Hamano1-1/+5
2011-12-20commit: do not lose mergetag header when not amendingJunio C Hamano1-1/+5
2011-12-19Merge branch 'jc/checkout-m-twoway'Junio C Hamano1-23/+35
2011-12-19Merge branch 'jk/fetch-no-tail-match-refs'Junio C Hamano2-7/+11
2011-12-19Merge branch 'nd/resolve-ref'Junio C Hamano14-50/+41
2011-12-19Merge branch 'jn/maint-sequencer-fixes'Junio C Hamano1-47/+91
2011-12-19Merge branch 'jk/maint-mv'Junio C Hamano1-2/+4
2011-12-19Merge branch 'ci/stripspace-docs'Junio C Hamano1-1/+1
2011-12-19Merge branch 'tr/cache-tree'Junio C Hamano2-4/+10
2011-12-18Update jk/maint-strbuf-missing-init to builtin/ renameJunio C Hamano89-0/+42160
2011-12-17use struct sha1_array in diff_tree_combined()René Scharfe1-6/+6
2011-12-16Merge branch 'jc/commit-amend-no-edit'Junio C Hamano1-4/+5