summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs/blame-refactor'Junio C Hamano2014-06-251-28/+14
|\
| * blame: simplify prepare_lines()rs/blame-refactorRené Scharfe2014-06-131-13/+7
| * blame: factor out get_next_line()René Scharfe2014-06-131-18/+10
* | Merge branch 'jk/repack-pack-writebitmaps-config'Junio C Hamano2014-06-252-10/+6
|\ \
| * | repack: introduce repack.writeBitmaps config optionJeff King2014-06-101-1/+2
| * | repack: simplify handling of --write-bitmap-indexJeff King2014-06-101-5/+4
| * | pack-objects: stop respecting pack.writebitmapsJeff King2014-06-101-4/+0
* | | Merge branch 'jk/repack-pack-keep-objects'Junio C Hamano2014-06-251-5/+9
|\ \ \ | |/ /
| * | repack: s/write_bitmap/&s/ in codejk/repack-pack-keep-objectsJeff King2014-06-101-6/+6
| * | repack: respect pack.writebitmapsJeff King2014-06-101-1/+5
| * | repack: do not accidentally pack kept objects by defaultJeff King2014-06-101-1/+1
* | | Merge branch 'jc/fetch-pull-refmap'Junio C Hamano2014-06-201-3/+32
|\ \ \
| * | | fetch: allow explicit --refmap to override configurationjc/fetch-push-refmapJunio C Hamano2014-06-051-3/+32
| | |/ | |/|
* | | Merge branch 'rs/more-starts-with'Junio C Hamano2014-06-201-1/+1
|\ \ \
| * | | Use starts_with() for C strings instead of memcmp()rs/more-starts-withRené Scharfe2014-06-091-1/+1
| |/ /
* | | Merge branch 'lt/log-auto-decorate'Junio C Hamano2014-06-161-0/+2
|\ \ \
| * | | git log: support "auto" decorationslt/log-auto-decorateLinus Torvalds2014-05-301-0/+2
| |/ /
* | | Merge branch 'jm/format-patch-mail-sig'Junio C Hamano2014-06-161-2/+24
|\ \ \
| * | | format-patch: add "--signature-file=<file>" optionjm/format-patch-mail-sigJeremiah Mahler2014-05-271-0/+17
| * | | format-patch: make newline after signature conditionalJeff King2014-05-211-2/+7
| |/ /
* | | Merge branch 'fc/remote-helper-refmap'Junio C Hamano2014-06-161-1/+48
|\ \ \
| * | | fast-export: add support to delete refsFelipe Contreras2014-04-211-0/+14
| * | | fast-export: add new --refspec optionFelipe Contreras2014-04-211-0/+32
| * | | fast-export: improve argument parsingFelipe Contreras2014-04-211-1/+2
* | | | Merge branch 'nd/daemonize-gc'Junio C Hamano2014-06-161-6/+20
|\ \ \ \
| * | | | gc --auto: do not lock refs in the backgroundnd/daemonize-gcNguyễn Thái Ngọc Duy2014-05-271-6/+20
* | | | | Merge branch 'jl/remote-rm-prune'Junio C Hamano2014-06-161-7/+30
|\ \ \ \ \
| * | | | | remote prune: optimize "dangling symref" check/warningjl/remote-rm-pruneJens Lindström2014-05-271-1/+6
| * | | | | remote: repack packed-refs once when deleting multiple refsJens Lindström2014-05-271-2/+18
| * | | | | remote rm: delete remote configuration as the lastJens Lindström2014-05-231-4/+6
| | |_|/ / | |/| | |
* | | | | Merge branch 'bg/xcalloc-nmemb-then-size'Junio C Hamano2014-06-162-5/+5
|\ \ \ \ \
| * | | | | builtin/remote.c: rearrange xcalloc argumentsBrian Gesiak2014-05-271-4/+4
| * | | | | builtin/ls-remote.c: rearrange xcalloc argumentsBrian Gesiak2014-05-271-1/+1
| |/ / / /
* | | | | Merge branch 'jl/status-added-submodule-is-never-ignored'Junio C Hamano2014-06-161-2/+16
|\ \ \ \ \
| * | | | | commit -m: commit staged submodules regardless of ignore configjl/status-added-submodule-is-never-ignoredJens Lehmann2014-04-071-2/+16
* | | | | | Merge branch 'jk/daemon-tolower'Junio C Hamano2014-06-161-14/+1
|\ \ \ \ \ \
| * | | | | | daemon/config: factor out duplicate xstrdup_tolowerjk/daemon-tolowerJeff King2014-05-231-14/+1
* | | | | | | Merge branch 'jk/diff-follow-must-take-one-pathspec'Junio C Hamano2014-06-161-6/+2
|\ \ \ \ \ \ \
| * | | | | | | move "--follow needs one pathspec" rule to diff_setup_donejk/diff-follow-must-take-one-pathspecJeff King2014-05-201-6/+2
| |/ / / / / /
* | | | | | | Merge branch 'cc/replace-edit'Junio C Hamano2014-06-161-45/+180
|\ \ \ \ \ \ \
| * | | | | | | replace: add --edit to usage stringChristian Couder2014-05-191-0/+1
| * | | | | | | replace: die early if replace ref already existsChristian Couder2014-05-191-1/+4
| * | | | | | | replace: refactor checking ref validityChristian Couder2014-05-191-11/+20
| * | | | | | | replace: make sure --edit results in a different objectChristian Couder2014-05-191-0/+3
| * | | | | | | replace: add --edit optionJeff King2014-04-291-1/+111
| * | | | | | | replace: factor object resolution out of replace_objectJeff King2014-04-291-8/+18
| * | | | | | | replace: use OPT_CMDMODE to handle modesJeff King2014-04-291-24/+25
| * | | | | | | replace: refactor command-mode determinationJeff King2014-04-291-8/+6
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'mt/patch-id-stable' (early part)Junio C Hamano2014-06-161-15/+59
|\ \ \ \ \ \ \
| * | | | | | | patch-id: make it stable against hunk reorderingMichael S. Tsirkin2014-06-101-15/+59
| | |_|/ / / / | |/| | | | |