summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)AuthorFilesLines
2010-09-03Merge branch 'jn/apply-filename-with-sp'Libravatar Junio C Hamano1-38/+211
2010-09-03Merge branch 'jn/merge-custom-no-trivial'Libravatar Junio C Hamano1-0/+1
2010-09-03Merge branch 'jn/update-contrib-example-merge'Libravatar Junio C Hamano3-6/+58
2010-09-03Merge branch 'jn/merge-renormalize'Libravatar Junio C Hamano5-26/+64
2010-09-03Sync with 1.7.2.3Libravatar Junio C Hamano1-1/+4
2010-09-03builtin/merge_recursive.c: Add an usage string and make use of it.Libravatar Thiago Farina1-1/+4
2010-09-03Move "show_all_errors = 1" to setup_unpack_trees_porcelain()Libravatar Matthieu Moy2-2/+0
2010-09-03setup_unpack_trees_porcelain: take the whole options struct as parameterLibravatar Matthieu Moy2-2/+2
2010-09-03Move set_porcelain_error_msgs to unpack-trees.c and rename itLibravatar Matthieu Moy2-2/+2
2010-09-01Merge branch 'sg/rerere-gc-old-still-used' into maintLibravatar Junio C Hamano1-5/+16
2010-09-01Merge branch 'dj/fetch-tagopt' into maintLibravatar Junio C Hamano1-4/+6
2010-08-31Merge branch 'jn/cherry-revert-message-clean-up'Libravatar Junio C Hamano1-69/+70
2010-08-31Merge branch 'ab/maint-reset-mixed-w-pathspec-advice'Libravatar Junio C Hamano1-1/+1
2010-08-31Merge branch 'dj/fetch-tagopt'Libravatar Junio C Hamano1-4/+6
2010-08-31Merge branch 'en/d-f-conflict-fix'Libravatar Junio C Hamano1-0/+29
2010-08-31Merge branch 'jn/paginate-fix'Libravatar Junio C Hamano9-31/+13
2010-08-31Merge branch 'jn/maint-setup-fix'Libravatar Junio C Hamano1-19/+5
2010-08-31Merge branch 'en/fast-export-fix'Libravatar Junio C Hamano1-1/+10
2010-08-31Merge branch 'sg/rerere-gc-old-still-used'Libravatar Junio C Hamano1-5/+16
2010-08-31notes: Don't create (empty) commit when removing non-existing notesLibravatar Johan Herland1-4/+10
2010-08-30checkout: Use submodule.*.ignore settings from .git/config and .gitmodulesLibravatar Jens Lehmann1-0/+5
2010-08-29object.h: Add OBJECT_ARRAY_INIT macro and make use of it.Libravatar Thiago Farina3-3/+3
2010-08-27format-patch: Don't go over merge commitsLibravatar Ramkumar Ramachandra1-6/+1
2010-08-26Merge branch 'maint'Libravatar Junio C Hamano2-7/+3
2010-08-26for-each-ref: fix objectname:short bugLibravatar Jay Soffian1-1/+2
2010-08-26merge-recursive --patienceLibravatar Justin Frankel1-0/+1
2010-08-26ll-merge: replace flag argument with options structLibravatar Jonathan Nieder1-1/+1
2010-08-26merge-recursive: expose merge options for builtin mergeLibravatar Jonathan Nieder2-31/+3
2010-08-25builtin/fetch.c: ignore merge config when not fetching from branch's remoteLibravatar Brandon Casey1-1/+3
2010-08-25checkout: respect diff.ignoreSubmodules settingLibravatar Johannes Schindelin1-4/+12
2010-08-25Fix 'git log' early pager startup error caseLibravatar Linus Torvalds1-6/+1
2010-08-24clone: warn users --depth is ignored in local clonesLibravatar Nguyễn Thái Ngọc Duy1-2/+5
2010-08-22Merge branch 'maint'Libravatar Junio C Hamano1-2/+2
2010-08-22Typos in code comments, an error message, documentationLibravatar Ralf Wildenhues1-2/+2
2010-08-21Merge branch 'gb/split-cmdline-errmsg'Libravatar Junio C Hamano1-1/+2
2010-08-21Merge branch 'sr/local-config'Libravatar Junio C Hamano1-2/+5
2010-08-21Merge branch 'dg/local-mod-error-messages'Libravatar Junio C Hamano2-2/+4
2010-08-21reset: suggest what to do upon "git reset --mixed <paths>"Libravatar Ævar Arnfjörð Bjarmason1-1/+1
2010-08-21apply: handle traditional patches with space in filenameLibravatar Jonathan Nieder1-14/+179
2010-08-21apply: split quoted filename handling into new functionLibravatar Jonathan Nieder1-30/+38
2010-08-20Merge branch 'jn/fix-abbrev' into maintLibravatar Junio C Hamano2-2/+0
2010-08-20Merge branch 'jn/rebase-rename-am' into maintLibravatar Junio C Hamano1-2/+1
2010-08-20builtin/checkout: Fix message when switching to an existing branchLibravatar Ramkumar Ramachandra1-1/+4
2010-08-18fmt-merge-msg -m to override merge titleLibravatar Jonathan Nieder1-2/+16
2010-08-18merge-base --independent to print reduced parent list in a mergeLibravatar Jonathan Nieder1-6/+15
2010-08-18merge-base --octopus to mimic show-branch --merge-baseLibravatar Jonathan Nieder1-3/+32
2010-08-18merge: do not mistake (ancestor of) tag for branchLibravatar Jonathan Nieder1-1/+1
2010-08-18Merge branch 'tf/string-list-init'Libravatar Junio C Hamano10-21/+21
2010-08-18Merge branch 'cc/find-commit-subject'Libravatar Junio C Hamano2-30/+12
2010-08-18Merge branch 'jl/submodule-ignore-diff'Libravatar Junio C Hamano5-0/+10