Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rs/blame-refactor' | Junio C Hamano | 2014-06-25 | 1 | -28/+14 |
|\ | |||||
| * | blame: simplify prepare_lines() | René Scharfe | 2014-06-13 | 1 | -13/+7 |
| * | blame: factor out get_next_line() | René Scharfe | 2014-06-13 | 1 | -18/+10 |
* | | Merge branch 'jk/repack-pack-writebitmaps-config' | Junio C Hamano | 2014-06-25 | 2 | -10/+6 |
|\ \ | |||||
| * | | repack: introduce repack.writeBitmaps config option | Jeff King | 2014-06-10 | 1 | -1/+2 |
| * | | repack: simplify handling of --write-bitmap-index | Jeff King | 2014-06-10 | 1 | -5/+4 |
| * | | pack-objects: stop respecting pack.writebitmaps | Jeff King | 2014-06-10 | 1 | -4/+0 |
* | | | Merge branch 'jk/repack-pack-keep-objects' | Junio C Hamano | 2014-06-25 | 1 | -5/+9 |
|\| | | |||||
| * | | repack: s/write_bitmap/&s/ in code | Jeff King | 2014-06-10 | 1 | -6/+6 |
| * | | repack: respect pack.writebitmaps | Jeff King | 2014-06-10 | 1 | -1/+5 |
| * | | repack: do not accidentally pack kept objects by default | Jeff King | 2014-06-10 | 1 | -1/+1 |
* | | | Merge branch 'jc/fetch-pull-refmap' | Junio C Hamano | 2014-06-20 | 1 | -3/+32 |
|\ \ \ | |||||
| * | | | fetch: allow explicit --refmap to override configuration | Junio C Hamano | 2014-06-06 | 1 | -3/+32 |
| | |/ | |/| | |||||
* | | | Merge branch 'rs/more-starts-with' | Junio C Hamano | 2014-06-20 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Use starts_with() for C strings instead of memcmp() | René Scharfe | 2014-06-09 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge branch 'lt/log-auto-decorate' | Junio C Hamano | 2014-06-16 | 1 | -0/+2 |
|\ \ \ | |||||
| * | | | git log: support "auto" decorations | Linus Torvalds | 2014-05-30 | 1 | -0/+2 |
| |/ / | |||||
* | | | Merge branch 'jm/format-patch-mail-sig' | Junio C Hamano | 2014-06-16 | 1 | -2/+24 |
|\ \ \ | |||||
| * | | | format-patch: add "--signature-file=<file>" option | Jeremiah Mahler | 2014-05-27 | 1 | -0/+17 |
| * | | | format-patch: make newline after signature conditional | Jeff King | 2014-05-21 | 1 | -2/+7 |
| |/ / | |||||
* | | | Merge branch 'fc/remote-helper-refmap' | Junio C Hamano | 2014-06-16 | 1 | -1/+48 |
|\ \ \ | |||||
| * | | | fast-export: add support to delete refs | Felipe Contreras | 2014-04-21 | 1 | -0/+14 |
| * | | | fast-export: add new --refspec option | Felipe Contreras | 2014-04-21 | 1 | -0/+32 |
| * | | | fast-export: improve argument parsing | Felipe Contreras | 2014-04-21 | 1 | -1/+2 |
* | | | | Merge branch 'nd/daemonize-gc' | Junio C Hamano | 2014-06-16 | 1 | -6/+20 |
|\ \ \ \ | |||||
| * | | | | gc --auto: do not lock refs in the background | Nguyễn Thái Ngọc Duy | 2014-05-27 | 1 | -6/+20 |
* | | | | | Merge branch 'jl/remote-rm-prune' | Junio C Hamano | 2014-06-16 | 1 | -7/+30 |
|\ \ \ \ \ | |||||
| * | | | | | remote prune: optimize "dangling symref" check/warning | Jens Lindström | 2014-05-27 | 1 | -1/+6 |
| * | | | | | remote: repack packed-refs once when deleting multiple refs | Jens Lindström | 2014-05-27 | 1 | -2/+18 |
| * | | | | | remote rm: delete remote configuration as the last | Jens Lindström | 2014-05-23 | 1 | -4/+6 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'bg/xcalloc-nmemb-then-size' | Junio C Hamano | 2014-06-16 | 2 | -5/+5 |
|\ \ \ \ \ | |||||
| * | | | | | builtin/remote.c: rearrange xcalloc arguments | Brian Gesiak | 2014-05-27 | 1 | -4/+4 |
| * | | | | | builtin/ls-remote.c: rearrange xcalloc arguments | Brian Gesiak | 2014-05-27 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge branch 'jl/status-added-submodule-is-never-ignored' | Junio C Hamano | 2014-06-16 | 1 | -2/+16 |
|\ \ \ \ \ | |||||
| * | | | | | commit -m: commit staged submodules regardless of ignore config | Jens Lehmann | 2014-04-07 | 1 | -2/+16 |
* | | | | | | Merge branch 'jk/daemon-tolower' | Junio C Hamano | 2014-06-16 | 1 | -14/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | daemon/config: factor out duplicate xstrdup_tolower | Jeff King | 2014-05-23 | 1 | -14/+1 |
* | | | | | | | Merge branch 'jk/diff-follow-must-take-one-pathspec' | Junio C Hamano | 2014-06-16 | 1 | -6/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | move "--follow needs one pathspec" rule to diff_setup_done | Jeff King | 2014-05-20 | 1 | -6/+2 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'cc/replace-edit' | Junio C Hamano | 2014-06-16 | 1 | -45/+180 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | replace: add --edit to usage string | Christian Couder | 2014-05-19 | 1 | -0/+1 |
| * | | | | | | | replace: die early if replace ref already exists | Christian Couder | 2014-05-19 | 1 | -1/+4 |
| * | | | | | | | replace: refactor checking ref validity | Christian Couder | 2014-05-19 | 1 | -11/+20 |
| * | | | | | | | replace: make sure --edit results in a different object | Christian Couder | 2014-05-19 | 1 | -0/+3 |
| * | | | | | | | replace: add --edit option | Jeff King | 2014-04-29 | 1 | -1/+111 |
| * | | | | | | | replace: factor object resolution out of replace_object | Jeff King | 2014-04-29 | 1 | -8/+18 |
| * | | | | | | | replace: use OPT_CMDMODE to handle modes | Jeff King | 2014-04-29 | 1 | -24/+25 |
| * | | | | | | | replace: refactor command-mode determination | Jeff King | 2014-04-29 | 1 | -8/+6 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'mt/patch-id-stable' (early part) | Junio C Hamano | 2014-06-16 | 1 | -15/+59 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | patch-id: make it stable against hunk reordering | Michael S. Tsirkin | 2014-06-10 | 1 | -15/+59 |
| | |_|/ / / / | |/| | | | | |