summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)AuthorFilesLines
2012-01-03write first for-merge ref to FETCH_HEAD firstLibravatar Joey Hess1-74/+86
2011-12-28Sync with 1.7.8.2Libravatar Junio C Hamano1-1/+1
2011-12-28Merge branch 'jv/maint-config-set' into maintLibravatar Junio C Hamano1-1/+1
2011-12-28Merge branch 'jc/checkout-m-twoway' into maintLibravatar Junio C Hamano1-24/+36
2011-12-28Merge branch 'jk/maint-strbuf-missing-init' into maintLibravatar Junio C Hamano2-2/+2
2011-12-28Merge branch 'jn/maint-sequencer-fixes' into maintLibravatar Junio C Hamano1-48/+92
2011-12-28Merge branch 'jk/maint-mv' into maintLibravatar Junio C Hamano1-2/+4
2011-12-28Merge branch 'jk/fetch-no-tail-match-refs' into maintLibravatar Junio C Hamano2-7/+11
2011-12-28Merge branch 'ci/stripspace-docs' into maintLibravatar Junio C Hamano1-1/+1
2011-12-28Merge branch 'jn/branch-move-to-self' into maintLibravatar Junio C Hamano2-6/+20
2011-12-27Fix an incorrect reference to --set-all.Libravatar Jelmer Vernooij1-1/+1
2011-12-22Merge branch 'ab/sun-studio-portability'Libravatar Junio C Hamano2-5/+5
2011-12-22Merge branch 'rr/revert-cherry-pick'Libravatar Junio C Hamano1-23/+25
2011-12-22Merge branch 'jk/maint-strbuf-missing-init'Libravatar Junio C Hamano2-2/+2
2011-12-22Merge branch 'rs/diff-tree-combined-clean-up'Libravatar Junio C Hamano1-6/+6
2011-12-22Merge branch 'tr/grep-threading'Libravatar Junio C Hamano1-15/+20
2011-12-22Merge branch 'nd/war-on-nul-in-commit'Libravatar Junio C Hamano4-6/+8
2011-12-21Sync with v1.7.8.1Libravatar Junio C Hamano3-5/+3
2011-12-21Merge branch 'bc/maint-apply-check-no-patch' into maintLibravatar Junio C Hamano1-5/+5
2011-12-21clone: the -o option has nothing to do with <branch>Libravatar Carlos Martín Nieto1-2/+2
2011-12-21builtin/log: remove redundant initializationLibravatar Michael Schubert1-2/+0
2011-12-21Merge branch 'ms/commit-cc-option-helpstring' into maintLibravatar Junio C Hamano1-1/+1
2011-12-21Appease Sun Studio by renaming "tmpfile"Libravatar Ævar Arnfjörð Bjarmason1-3/+3
2011-12-21Fix an enum assignment issue spotted by Sun StudioLibravatar Ævar Arnfjörð Bjarmason1-2/+2
2011-12-20Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2011-12-20builtin/init-db.c: eliminate -Wformat warning on SolarisLibravatar Ævar Arnfjörð Bjarmason1-1/+1
2011-12-20Merge branch 'jc/pull-signed-tag'Libravatar Junio C Hamano1-1/+5
2011-12-20commit: do not lose mergetag header when not amendingLibravatar Junio C Hamano1-1/+5
2011-12-19Merge branch 'jc/checkout-m-twoway'Libravatar Junio C Hamano1-24/+36
2011-12-19Merge branch 'jk/fetch-no-tail-match-refs'Libravatar Junio C Hamano2-7/+11
2011-12-19Merge branch 'nd/resolve-ref'Libravatar Junio C Hamano14-50/+41
2011-12-19Merge branch 'jn/maint-sequencer-fixes'Libravatar Junio C Hamano1-48/+92
2011-12-19Merge branch 'jk/maint-mv'Libravatar Junio C Hamano1-2/+4
2011-12-19Merge branch 'ci/stripspace-docs'Libravatar Junio C Hamano1-1/+1
2011-12-19Merge branch 'tr/cache-tree'Libravatar Junio C Hamano2-4/+10
2011-12-18Update jk/maint-strbuf-missing-init to builtin/ renameLibravatar Junio C Hamano89-0/+42160
2011-12-17use struct sha1_array in diff_tree_combined()Libravatar René Scharfe1-6/+6
2011-12-16Merge branch 'jc/commit-amend-no-edit'Libravatar Junio C Hamano1-4/+5
2011-12-16Merge branch 'jc/stream-to-pack'Libravatar Junio C Hamano2-44/+23
2011-12-16Merge branch 'jk/upload-archive-use-start-command'Libravatar Junio C Hamano1-31/+12
2011-12-16grep: disable threading in non-worktree caseLibravatar Thomas Rast1-18/+18
2011-12-16grep: enable threading with -p and -W using lazy attribute lookupLibravatar Thomas Rast1-4/+9
2011-12-15revert: simplify getting commit subject in format_todo()Libravatar Ramkumar Ramachandra1-5/+5
2011-12-15revert: tolerate extra spaces, tabs in insn sheetLibravatar Ramkumar Ramachandra1-6/+12
2011-12-15revert: make commit subjects in insn sheet optionalLibravatar Ramkumar Ramachandra1-21/+16
2011-12-15revert: free msg in format_todo()Libravatar Ramkumar Ramachandra1-0/+1
2011-12-15Convert commit_tree() to take strbuf as messageLibravatar Nguyễn Thái Ngọc Duy4-6/+6
2011-12-15merge: abort if fails to commitLibravatar Nguyễn Thái Ngọc Duy1-2/+4
2011-12-15checkout_merged(): squelch false warning from some gccLibravatar Junio C Hamano1-1/+1
2011-12-13Merge branch 'ks/tag-cleanup'Libravatar Junio C Hamano1-14/+53