aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'rs/blame-refactor'Junio C Hamano2014-06-25
|\
| * blame: simplify prepare_lines()René Scharfe2014-06-13
| * blame: factor out get_next_line()René Scharfe2014-06-13
* | Merge branch 'jk/repack-pack-writebitmaps-config'Junio C Hamano2014-06-25
|\ \
| * | repack: introduce repack.writeBitmaps config optionJeff King2014-06-10
| * | repack: simplify handling of --write-bitmap-indexJeff King2014-06-10
| * | pack-objects: stop respecting pack.writebitmapsJeff King2014-06-10
* | | Merge branch 'jk/repack-pack-keep-objects'Junio C Hamano2014-06-25
|\ \ \ | |/ /
| * | repack: s/write_bitmap/&s/ in codeJeff King2014-06-10
| * | repack: respect pack.writebitmapsJeff King2014-06-10
| * | repack: do not accidentally pack kept objects by defaultJeff King2014-06-10
* | | Merge branch 'jc/fetch-pull-refmap'Junio C Hamano2014-06-20
|\ \ \
| * | | fetch: allow explicit --refmap to override configurationJunio C Hamano2014-06-05
| | |/ | |/|
* | | Merge branch 'rs/more-starts-with'Junio C Hamano2014-06-20
|\ \ \
| * | | Use starts_with() for C strings instead of memcmp()René Scharfe2014-06-09
| |/ /
* | | Merge branch 'lt/log-auto-decorate'Junio C Hamano2014-06-16
|\ \ \
| * | | git log: support "auto" decorationsLinus Torvalds2014-05-30
| |/ /
* | | Merge branch 'jm/format-patch-mail-sig'Junio C Hamano2014-06-16
|\ \ \
| * | | format-patch: add "--signature-file=<file>" optionJeremiah Mahler2014-05-27
| * | | format-patch: make newline after signature conditionalJeff King2014-05-21
| |/ /
* | | Merge branch 'fc/remote-helper-refmap'Junio C Hamano2014-06-16
|\ \ \
| * | | fast-export: add support to delete refsFelipe Contreras2014-04-21
| * | | fast-export: add new --refspec optionFelipe Contreras2014-04-21
| * | | fast-export: improve argument parsingFelipe Contreras2014-04-21
* | | | Merge branch 'nd/daemonize-gc'Junio C Hamano2014-06-16
|\ \ \ \
| * | | | gc --auto: do not lock refs in the backgroundNguyễn Thái Ngọc Duy2014-05-27
* | | | | Merge branch 'jl/remote-rm-prune'Junio C Hamano2014-06-16
|\ \ \ \ \
| * | | | | remote prune: optimize "dangling symref" check/warningJens Lindström2014-05-27
| * | | | | remote: repack packed-refs once when deleting multiple refsJens Lindström2014-05-27
| * | | | | remote rm: delete remote configuration as the lastJens Lindström2014-05-23
| | |_|/ / | |/| | |
* | | | | Merge branch 'bg/xcalloc-nmemb-then-size'Junio C Hamano2014-06-16
|\ \ \ \ \
| * | | | | builtin/remote.c: rearrange xcalloc argumentsBrian Gesiak2014-05-27
| * | | | | builtin/ls-remote.c: rearrange xcalloc argumentsBrian Gesiak2014-05-27
| |/ / / /
* | | | | Merge branch 'jl/status-added-submodule-is-never-ignored'Junio C Hamano2014-06-16
|\ \ \ \ \
| * | | | | commit -m: commit staged submodules regardless of ignore configJens Lehmann2014-04-07
* | | | | | Merge branch 'jk/daemon-tolower'Junio C Hamano2014-06-16
|\ \ \ \ \ \
| * | | | | | daemon/config: factor out duplicate xstrdup_tolowerJeff King2014-05-23
* | | | | | | Merge branch 'jk/diff-follow-must-take-one-pathspec'Junio C Hamano2014-06-16
|\ \ \ \ \ \ \
| * | | | | | | move "--follow needs one pathspec" rule to diff_setup_doneJeff King2014-05-20
| |/ / / / / /
* | | | | | | Merge branch 'cc/replace-edit'Junio C Hamano2014-06-16
|\ \ \ \ \ \ \
| * | | | | | | replace: add --edit to usage stringChristian Couder2014-05-19
| * | | | | | | replace: die early if replace ref already existsChristian Couder2014-05-19
| * | | | | | | replace: refactor checking ref validityChristian Couder2014-05-19
| * | | | | | | replace: make sure --edit results in a different objectChristian Couder2014-05-19
| * | | | | | | replace: add --edit optionJeff King2014-04-29
| * | | | | | | replace: factor object resolution out of replace_objectJeff King2014-04-29
| * | | | | | | replace: use OPT_CMDMODE to handle modesJeff King2014-04-29
| * | | | | | | replace: refactor command-mode determinationJeff King2014-04-29
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'mt/patch-id-stable' (early part)Junio C Hamano2014-06-16
|\ \ \ \ \ \ \
| * | | | | | | patch-id: make it stable against hunk reorderingMichael S. Tsirkin2014-06-10
| | |_|/ / / / | |/| | | | |