summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)AuthorFilesLines
2010-04-03Merge branch 'ef/cherry-abbrev'Libravatar Junio C Hamano3-27/+25
2010-04-03Merge branch 'rs/threaded-grep-context'Libravatar Junio C Hamano1-2/+13
2010-04-02git status: refresh the index if possibleLibravatar Markus Heidelberg1-0/+9
2010-04-02builtin/commit: remove unnecessary variable definitionLibravatar Markus Heidelberg1-1/+1
2010-04-02builtin/commit: fix duplicated sentence in a commentLibravatar Markus Heidelberg1-2/+2
2010-04-01make commit_tree a library functionLibravatar Jeff King1-69/+1
2010-04-01revert: add "--strategy" option to choose merge strategyLibravatar Christian Couder1-2/+23
2010-04-01merge: make function try_merge_command non staticLibravatar Christian Couder1-2/+2
2010-04-01merge: refactor code that calls "git merge-STRATEGY"Libravatar Christian Couder1-36/+45
2010-04-01revert: refactor merge recursive code into its own functionLibravatar Christian Couder1-48/+58
2010-04-01revert: use strbuf to refactor the code that writes the merge messageLibravatar Christian Couder1-36/+34
2010-03-31Sync with 1.7.0.4Libravatar Junio C Hamano1-1/+2
2010-03-31clone: also configure url for bare clonesLibravatar Sverre Rabbelier1-4/+4
2010-03-31clone: pass the remote name to remote_getLibravatar Sverre Rabbelier1-4/+4
2010-03-29Merge branch 'maint'Libravatar Junio C Hamano1-1/+8
2010-03-28Merge branch 'cc/cherry-pick-ff'Libravatar Junio C Hamano2-5/+43
2010-03-28Merge branch 'sb/notes-parse-opt'Libravatar Junio C Hamano1-159/+371
2010-03-28Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2010-03-28Introduce remove_or_warn functionLibravatar Peter Collingbourne1-5/+1
2010-03-28Allow passing of configuration parameters in the command lineLibravatar Alex Riesen1-1/+5
2010-03-24fmt-merge-msg: hide summary optionLibravatar Stephen Boyd1-1/+3
2010-03-24fmt-merge-msg: remove custom string_list implementationLibravatar Stephen Boyd1-83/+44
2010-03-24fmt-merge-msg: use pretty.c routinesLibravatar Stephen Boyd1-21/+8
2010-03-24fmt-merge-msg: be quiet if nothing to mergeLibravatar Stephen Boyd1-0/+3
2010-03-24Merge branch 'tr/notes-display'Libravatar Junio C Hamano3-1/+246
2010-03-24Merge branch 'pb/log-first-parent-p-m'Libravatar Junio C Hamano2-15/+52
2010-03-21git checkout: create unparented branch by --orphanLibravatar Erick Mattos1-2/+13
2010-03-21ls: remove redundant logicLibravatar Erik Faye-Lund2-9/+4
2010-03-21cherry: support --abbrev optionLibravatar Erik Faye-Lund1-18/+21
2010-03-20cherry-pick, revert: add a label for ancestorLibravatar Jonathan Nieder1-1/+4
2010-03-20revert: clarify label on conflict hunksLibravatar Jonathan Nieder1-39/+62
2010-03-20checkout -m --conflict=diff3: add a label for ancestorLibravatar Jonathan Nieder1-0/+1
2010-03-20checkout --conflict=diff3: add a label for ancestorLibravatar Jonathan Nieder1-1/+1
2010-03-20ll_merge(): add ancestor label parameter for diff3-style outputLibravatar Jonathan Nieder1-1/+1
2010-03-20merge-file --diff3: add a label for ancestorLibravatar Jonathan Nieder1-0/+1
2010-03-20xdl_merge(): move file1 and file2 labels to xmparam structureLibravatar Jonathan Nieder1-2/+3
2010-03-20Merge branch 'ml/color-grep'Libravatar Junio C Hamano1-8/+28
2010-03-20Merge branch 'cc/reset-keep'Libravatar Junio C Hamano1-9/+38
2010-03-20Merge branch 'bg/apply-fix-blank-at-eof'Libravatar Junio C Hamano1-40/+145
2010-03-20Merge branch 'bw/union-merge-refactor'Libravatar Junio C Hamano1-9/+14
2010-03-20Merge branch 'maint'Libravatar Junio C Hamano1-6/+5
2010-03-15grep: enable threading for context line printingLibravatar René Scharfe1-2/+13
2010-03-15Merge branch 'sd/format-patch-to'Libravatar Junio C Hamano1-39/+61
2010-03-15Merge branch 'tc/transport-verbosity'Libravatar Junio C Hamano3-20/+17
2010-03-15Merge branch 'ld/push-porcelain'Libravatar Junio C Hamano2-3/+7
2010-03-15Merge branch 'jh/notes'Libravatar Junio C Hamano1-0/+455
2010-03-13Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2010-03-10Merge branch 'sd/init-template'Libravatar Junio C Hamano1-0/+14
2010-03-10Merge branch 'sh/am-keep-cr'Libravatar Junio C Hamano1-1/+1
2010-03-10Merge branch 'cp/add-u-pathspec'Libravatar Junio C Hamano1-9/+29