summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* for-each-ref: Field with abbreviated objectnameMichael J Gruber2010-05-181-0/+3
* Merge branch 'maint'Junio C Hamano2010-05-101-1/+1
|\
| * handle "git --bare init <dir>" properlyJeff King2010-05-101-1/+1
* | Merge branch 'bg/apply-blank-trailing-context'Junio C Hamano2010-05-081-6/+6
* | Merge branch 'rc/ls-remote-default'Junio C Hamano2010-05-081-4/+7
|\ \
| * | ls-remote: fall-back to default remotes when no remote specifiedTay Ray Chuan2010-04-081-4/+7
* | | Merge branch 'ab/commit-empty-message'Junio C Hamano2010-05-081-3/+9
|\ \ \
| * | | Add option to git-commit to allow empty log messagesÆvar Arnfjörð Bjarmason2010-04-071-3/+9
* | | | Merge branch 'jc/maint-reflog-expire-unreachable'Junio C Hamano2010-05-081-40/+56
* | | | Merge branch 'sd/log-decorate'Junio C Hamano2010-05-081-6/+40
* | | | Merge branch 'mh/status-optionally-refresh'Junio C Hamano2010-05-081-0/+9
|\ \ \ \
| * | | | git status: refresh the index if possibleMarkus Heidelberg2010-04-021-0/+9
* | | | | Merge branch 'cw/ws-indent-with-tab'Junio C Hamano2010-05-081-42/+39
|\ \ \ \ \
| * | | | | whitespace: replumb ws_fix_copy to take a strbuf *dst instead of char *dstChris Webb2010-04-041-42/+39
* | | | | | Merge branch 'cc/revert-strategy'Junio C Hamano2010-05-082-110/+150
|\ \ \ \ \ \
| * | | | | | revert: add "--strategy" option to choose merge strategyChristian Couder2010-04-011-2/+23
| * | | | | | merge: make function try_merge_command non staticChristian Couder2010-04-011-2/+2
| * | | | | | merge: refactor code that calls "git merge-STRATEGY"Christian Couder2010-04-011-36/+45
| * | | | | | revert: refactor merge recursive code into its own functionChristian Couder2010-04-011-48/+58
| * | | | | | revert: use strbuf to refactor the code that writes the merge messageChristian Couder2010-04-011-36/+34
* | | | | | | Merge branch 'jk/cached-textconv'Junio C Hamano2010-05-081-69/+1
|\ \ \ \ \ \ \
| * | | | | | | make commit_tree a library functionJeff King2010-04-011-69/+1
* | | | | | | | Merge branch 'pc/remove-warn'Junio C Hamano2010-05-081-5/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Introduce remove_or_warn functionPeter Collingbourne2010-03-281-5/+1
* | | | | | | | cherry-pick: do not dump core when iconv failsJonathan Nieder2010-05-081-2/+7
* | | | | | | | clone: quell the progress report from init and report on cloneJunio C Hamano2010-05-041-1/+5
* | | | | | | | Merge branch 'maint'Junio C Hamano2010-05-011-1/+1
* | | | | | | | Merge branch 'maint'Junio C Hamano2010-04-191-1/+1
* | | | | | | | Merge branch 'jg/auto-initialize-notes-with-percent-n-in-format'Junio C Hamano2010-04-181-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | pretty: Initialize notes if %N is usedJohannes Gilger2010-04-131-1/+5
* | | | | | | | | tag -v: use RUN_GIT_CMD to run verify-tagJonathan Nieder2010-04-171-2/+2
|/ / / / / / / /
* | | | | | | | Merge branch 'maint'Junio C Hamano2010-04-093-9/+6
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge branch 'jn/mailinfo-scissors'Junio C Hamano2010-04-071-1/+2
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Teach mailinfo %< as an alternative scissors markJonathan Nieder2010-04-041-1/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'sb/fmt-merge-msg'Junio C Hamano2010-04-061-103/+56
|\ \ \ \ \ \
| * | | | | | fmt-merge-msg: hide summary optionStephen Boyd2010-03-241-1/+3
| * | | | | | fmt-merge-msg: remove custom string_list implementationStephen Boyd2010-03-241-83/+44
| * | | | | | fmt-merge-msg: use pretty.c routinesStephen Boyd2010-03-241-21/+8
| * | | | | | fmt-merge-msg: be quiet if nothing to mergeStephen Boyd2010-03-241-0/+3
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'ef/maint-empty-commit-log'Junio C Hamano2010-04-061-1/+4
* | | | | | Merge branch 'mg/use-default-abbrev-length-in-rev-list'Junio C Hamano2010-04-031-1/+1
* | | | | | Merge branch 'jn/merge-diff3-label'Junio C Hamano2010-04-033-42/+70
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | cherry-pick, revert: add a label for ancestorJonathan Nieder2010-03-201-1/+4
| * | | | | revert: clarify label on conflict hunksJonathan Nieder2010-03-201-39/+62
| * | | | | checkout -m --conflict=diff3: add a label for ancestorJonathan Nieder2010-03-201-0/+1
| * | | | | checkout --conflict=diff3: add a label for ancestorJonathan Nieder2010-03-201-1/+1
| * | | | | ll_merge(): add ancestor label parameter for diff3-style outputJonathan Nieder2010-03-201-1/+1
| * | | | | merge-file --diff3: add a label for ancestorJonathan Nieder2010-03-201-0/+1
| * | | | | xdl_merge(): move file1 and file2 labels to xmparam structureJonathan Nieder2010-03-201-2/+3
* | | | | | Merge branch 'ef/cherry-abbrev'Junio C Hamano2010-04-033-27/+25
|\ \ \ \ \ \