summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs/grep-binary'Junio C Hamano2010-06-131-2/+6
|\
| * grep: support NUL chars in search strings for -FRené Scharfe2010-05-241-2/+6
* | Merge branch 'js/try-to-free-stackable'Junio C Hamano2010-06-131-2/+4
* | Merge branch 'jn/maint-amend-missing-name'Junio C Hamano2010-06-131-7/+13
|\ \
| * | commit --amend: cope with missing display nameJonathan Nieder2010-05-041-7/+13
* | | Merge branch 'rs/diff-no-minimal'Junio C Hamano2010-06-134-4/+4
* | | Merge branch 'maint'Junio C Hamano2010-06-072-3/+3
|\ \ \
| * | | Change C99 comments to old-style C commentsTor Arntsen2010-06-072-3/+3
* | | | Merge branch 'maint'Junio C Hamano2010-05-251-1/+2
|\ \ \ \ | |/ / /
| * | | show-branch: use DEFAULT_ABBREV instead of 7Tay Ray Chuan2010-05-251-1/+2
* | | | Merge branch 'pb/patch-id-plus'Junio C Hamano2010-05-211-19/+88
|\ \ \ \
| * | | | patch-id: Add support for mbox formatPaolo Bonzini2010-04-191-6/+62
| * | | | patch-id: extract parsing one diff out of generate_id_listPaolo Bonzini2010-04-191-13/+26
* | | | | Merge branch 'st/remote-tags-no-tags'Junio C Hamano2010-05-211-1/+20
|\ \ \ \ \
| * | | | | remote add: add a --[no-]tags optionSamuel Tardieu2010-04-191-1/+20
| |/ / / /
* | | | | Merge branch 'jn/shortlog'Junio C Hamano2010-05-211-1/+2
* | | | | Merge branch 'js/maint-receive-pack-symref-alias'Junio C Hamano2010-05-211-37/+91
* | | | | Merge branch 'np/index-pack-memsave'Junio C Hamano2010-05-211-44/+45
* | | | | Merge branch 'jc/maint-no-reflog-expire-unreach-for-head'Junio C Hamano2010-05-211-10/+59
* | | | | Merge branch 'sp/maint-describe-tiebreak-with-tagger-date'Junio C Hamano2010-05-211-4/+45
* | | | | Merge branch 'jc/status-show-ignored'Junio C Hamano2010-05-211-1/+5
|\ \ \ \ \
| * | | | | status: --ignored option shows ignored filesJunio C Hamano2010-04-101-1/+5
* | | | | | Merge branch 'np/malloc-threading'Junio C Hamano2010-05-212-3/+12
* | | | | | Merge branch 'sr/remote-helper-export'Junio C Hamano2010-05-211-8/+8
|\ \ \ \ \ \
| * | | | | | clone: also configure url for bare clonesSverre Rabbelier2010-03-311-4/+4
| * | | | | | clone: pass the remote name to remote_getSverre Rabbelier2010-03-311-4/+4
* | | | | | | Merge branch 'ar/config-from-command-line'Junio C Hamano2010-05-211-1/+5
|\ \ \ \ \ \ \
| * | | | | | | Allow passing of configuration parameters in the command lineAlex Riesen2010-03-281-1/+5
* | | | | | | | Merge branch 'em/checkout-orphan'Junio C Hamano2010-05-211-2/+13
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | git checkout: create unparented branch by --orphanErick Mattos2010-03-211-2/+13
| |/ / / / / /
* | | | | | | 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