summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)AuthorFilesLines
2010-06-16Merge branch 'jn/shortlog' into maintLibravatar Junio C Hamano1-1/+2
2010-06-16Merge branch 'np/index-pack-memsave' into maintLibravatar Junio C Hamano1-44/+45
2010-06-16Merge branch 'sp/maint-describe-tiebreak-with-tagger-date' into maintLibravatar Junio C Hamano1-4/+45
2010-06-16Merge branch 'np/malloc-threading' into maintLibravatar Junio C Hamano2-3/+12
2010-06-16Merge branch 'mh/status-optionally-refresh' into maintLibravatar Junio C Hamano1-0/+9
2010-06-15notes: Initialize variable to appease Sun StudioLibravatar Ævar Arnfjörð Bjarmason1-1/+1
2010-06-07Change C99 comments to old-style C commentsLibravatar Tor Arntsen2-3/+3
2010-05-25show-branch: use DEFAULT_ABBREV instead of 7Libravatar Tay Ray Chuan1-1/+2
2010-05-10handle "git --bare init <dir>" properlyLibravatar Jeff King1-1/+1
2010-05-08cherry-pick: do not dump core when iconv failsLibravatar Jonathan Nieder1-2/+7
2010-05-04clone: quell the progress report from init and report on cloneLibravatar Junio C Hamano1-1/+5
2010-05-01Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2010-04-19Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2010-04-18Merge branch 'jg/auto-initialize-notes-with-percent-n-in-format'Libravatar Junio C Hamano1-1/+5
2010-04-17tag -v: use RUN_GIT_CMD to run verify-tagLibravatar Jonathan Nieder1-2/+2
2010-04-13pretty: Initialize notes if %N is usedLibravatar Johannes Gilger1-1/+5
2010-04-09Merge branch 'maint'Libravatar Junio C Hamano3-9/+6
2010-04-07Merge branch 'jn/mailinfo-scissors'Libravatar Junio C Hamano1-1/+2
2010-04-06Merge branch 'sb/fmt-merge-msg'Libravatar Junio C Hamano1-103/+56
2010-04-06Merge branch 'ef/maint-empty-commit-log'Libravatar Junio C Hamano1-1/+4
2010-04-04Teach mailinfo %< as an alternative scissors markLibravatar Jonathan Nieder1-1/+2
2010-04-03Merge branch 'mg/use-default-abbrev-length-in-rev-list'Libravatar Junio C Hamano1-1/+1
2010-04-03Merge branch 'jn/merge-diff3-label'Libravatar Junio C Hamano3-42/+70
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-03-31Sync with 1.7.0.4Libravatar Junio C Hamano1-1/+2
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-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-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