summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* refactor skip_prefix to return a booleanJeff King2014-06-206-18/+17
* avoid using skip_prefix as a booleanJeff King2014-06-181-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
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'rs/mailinfo-header-cmp'Junio C Hamano2014-06-091-3/+3
|\ \ \ \ \ \
| * | | | | | mailinfo: use strcmp() for string comparisonrs/mailinfo-header-cmpRené Scharfe2014-06-021-3/+3
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'jc/rev-parse-argh-dashed-multi-words'Junio C Hamano2014-06-091-0/+3
|\ \ \ \ \ \
| * | | | | | update-index: fix segfault with missing --cacheinfo argumentjc/rev-parse-argh-dashed-multi-wordsJeff King2014-06-041-0/+3
* | | | | | | Merge branch 'nd/status-auto-comment-char'Junio C Hamano2014-06-061-0/+32
|\ \ \ \ \ \ \
| * | | | | | | commit: allow core.commentChar=auto for character auto selectionnd/status-auto-comment-charNguyễn Thái Ngọc Duy2014-05-191-0/+32
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'sk/spawn-less-case-insensitively-from-grep-O-i'Junio C Hamano2014-06-061-0/+3
|\ \ \ \ \ \ \
| * | | | | | | git grep -O -i: if the pager is 'less', pass the '-I' optionsk/spawn-less-case-insensitively-from-grep-O-iJohannes Schindelin2014-05-151-0/+3
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'jk/index-pack-report-missing'Junio C Hamano2014-06-061-2/+7
|\ \ \ \ \ \ \
| * | | | | | | index-pack: distinguish missing objects from type errorsjk/index-pack-report-missingJeff King2014-05-121-2/+7
* | | | | | | | Merge branch 'bc/blame-crlf-test'Junio C Hamano2014-06-061-1/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | blame: correctly handle files regardless of autocrlfbc/blame-crlf-testbrian m. carlson2014-05-081-1/+0
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'dk/blame-reorg'Junio C Hamano2014-06-061-298/+567
|\ \ \ \ \ \ \ \