summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)AuthorFilesLines
2010-09-15Merge branch 'dr/maint-ls-tree-prefix-recursion-fix'Junio C Hamano1-0/+2
2010-09-12ls-tree $di $dir: do not mistakenly recurse into directoriesJunio C Hamano1-0/+2
2010-09-09builtin/fetch.c: comment that branch->remote_name is usable when has_mergeBrandon Casey1-0/+3
2010-09-08Merge branch 'jh/error-removing-missing-note'Junio C Hamano1-4/+10
2010-09-08Merge branch 'bc/maint-fetch-url-only'Junio C Hamano1-1/+3
2010-09-08Merge branch 'en/d-f-conflict-fix'Junio C Hamano1-1/+9
2010-09-08fast-export: ensure that a renamed file is printed after all referencesJohannes Sixt1-1/+9
2010-09-06revert: Fix trivial comment style issueElijah Newren1-1/+0
2010-09-06Merge branch 'jh/clean-exclude'Junio C Hamano1-1/+1
2010-09-06builtin/clean.c: Use STRING_LIST_INIT_NODUP.Thiago Farina1-1/+1
2010-09-04Merge branch 'jl/submodule-ignore-diff'Junio C Hamano1-4/+17
2010-09-03Merge branch 'dg/local-mod-error-messages'Junio C Hamano2-4/+2
2010-09-03Merge branch 'nd/clone-depth-zero'Junio C Hamano1-2/+5
2010-09-03Merge branch 'jn/apply-filename-with-sp'Junio C Hamano1-38/+211
2010-09-03Merge branch 'jn/merge-custom-no-trivial'Junio C Hamano1-0/+1
2010-09-03Merge branch 'jn/update-contrib-example-merge'Junio C Hamano3-6/+58
2010-09-03Merge branch 'jn/merge-renormalize'Junio C Hamano5-25/+63
2010-09-03Sync with 1.7.2.3Junio C Hamano1-1/+4
2010-09-03builtin/merge_recursive.c: Add an usage string and make use of it.Thiago Farina1-1/+4
2010-09-03Move "show_all_errors = 1" to setup_unpack_trees_porcelain()Matthieu Moy2-2/+0
2010-09-03setup_unpack_trees_porcelain: take the whole options struct as parameterMatthieu Moy2-2/+2
2010-09-03Move set_porcelain_error_msgs to unpack-trees.c and rename itMatthieu Moy2-2/+2
2010-09-01Merge branch 'sg/rerere-gc-old-still-used' into maintJunio C Hamano1-5/+16
2010-09-01Merge branch 'dj/fetch-tagopt' into maintJunio C Hamano1-4/+6
2010-08-31Merge branch 'jn/cherry-revert-message-clean-up'Junio C Hamano1-69/+70
2010-08-31Merge branch 'ab/maint-reset-mixed-w-pathspec-advice'Junio C Hamano1-1/+1
2010-08-31Merge branch 'dj/fetch-tagopt'Junio C Hamano1-4/+6
2010-08-31Merge branch 'en/d-f-conflict-fix'Junio C Hamano1-0/+29
2010-08-31Merge branch 'jn/paginate-fix'Junio C Hamano9-31/+13
2010-08-31Merge branch 'jn/maint-setup-fix'Junio C Hamano1-19/+5
2010-08-31Merge branch 'en/fast-export-fix'Junio C Hamano1-1/+10
2010-08-31Merge branch 'sg/rerere-gc-old-still-used'Junio C Hamano1-5/+16
2010-08-31notes: Don't create (empty) commit when removing non-existing notesJohan Herland1-4/+10
2010-08-30checkout: Use submodule.*.ignore settings from .git/config and .gitmodulesJens Lehmann1-0/+5
2010-08-29object.h: Add OBJECT_ARRAY_INIT macro and make use of it.Thiago Farina3-3/+3
2010-08-26Merge branch 'maint'Junio C Hamano2-7/+3
2010-08-26for-each-ref: fix objectname:short bugJay Soffian1-1/+2
2010-08-25builtin/fetch.c: ignore merge config when not fetching from branch's remoteBrandon Casey1-1/+3
2010-08-25checkout: respect diff.ignoreSubmodules settingJohannes Schindelin1-4/+12
2010-08-25Fix 'git log' early pager startup error caseLinus Torvalds1-6/+1
2010-08-24clone: warn users --depth is ignored in local clonesNguyễn Thái Ngọc Duy1-2/+5
2010-08-22Merge branch 'maint'Junio C Hamano1-2/+2
2010-08-22Typos in code comments, an error message, documentationRalf Wildenhues1-2/+2
2010-08-21Merge branch 'gb/split-cmdline-errmsg'Junio C Hamano1-1/+2
2010-08-21Merge branch 'sr/local-config'Junio C Hamano1-2/+5
2010-08-21Merge branch 'dg/local-mod-error-messages'Junio C Hamano2-2/+4
2010-08-21reset: suggest what to do upon "git reset --mixed <paths>"Ævar Arnfjörð Bjarmason1-1/+1
2010-08-21apply: handle traditional patches with space in filenameJonathan Nieder1-14/+179
2010-08-21apply: split quoted filename handling into new functionJonathan Nieder1-30/+38
2010-08-20Merge branch 'jn/fix-abbrev' into maintJunio C Hamano2-2/+0