summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ms/ls-remote-exit-with-status'Junio C Hamano2011-05-231-2/+9
|\
| * ls-remote: the --exit-code option reports "no matching refs"Michael Schubert2011-05-181-2/+9
* | Merge branch 'mg/config-symbolic-constants'Junio C Hamano2011-05-231-1/+6
|\ \
| * | config: Give error message when not changing a multivarMichael J Gruber2011-05-171-1/+6
| |/
* | Merge branch 'jc/magic-pathspec'Junio C Hamano2011-05-231-7/+1
|\ \
| * | grep: use get_pathspec() correctlyJunio C Hamano2011-05-101-7/+1
* | | Merge branch 'jk/blame-line-porcelain'Junio C Hamano2011-05-231-10/+23
|\ \ \
| * | | blame: add --line-porcelain output formatJeff King2011-05-091-2/+8
| * | | blame: refactor porcelain outputJeff King2011-05-091-9/+16
* | | | Merge branch 'jc/replacing'Junio C Hamano2011-05-191-2/+2
|\ \ \ \
| * | | | read_sha1_file(): get rid of read_sha1_file_repl() madnessJunio C Hamano2011-05-151-2/+2
| |/ / /
* | | | Merge branch 'ms/tagname-does-not-begin-with-dash'Junio C Hamano2011-05-191-8/+18
|\ \ \ \
| * | | | tag: disallow '-' as tag nameMichael Schubert2011-05-101-8/+18
* | | | | Merge branch 'jk/git-connection-deadlock-fix'Junio C Hamano2011-05-191-0/+2
* | | | | Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix'Junio C Hamano2011-05-191-2/+2
* | | | | Merge branch 'jk/cherry-pick-root-with-resolve'Junio C Hamano2011-05-192-5/+11
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | revert: allow reverting a root commitJeff King2011-05-161-3/+1
| * | | | cherry-pick: handle root commits with external strategiesJeff King2011-05-161-2/+10
| * | | | Merge branch 'cn/format-patch-quiet' into maintJunio C Hamano2011-05-151-6/+10
| |\ \ \ \
* | \ \ \ \ Merge branch 'ci/commit--interactive-atomic'Junio C Hamano2011-05-162-15/+37
|\ \ \ \ \ \
| * | | | | | Add support for -p/--patch to git-commitConrad Irwin2011-05-092-6/+10
| * | | | | | Allow git commit --interactive with pathsConrad Irwin2011-05-091-2/+0
| * | | | | | Use a temporary index for git commit --interactiveConrad Irwin2011-05-081-8/+28
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'mg/merge-ff-config'Junio C Hamano2011-05-161-0/+9
|\ \ \ \ \ \
| * | | | | | merge: introduce merge.ff configuration variableJunio C Hamano2011-05-061-0/+9
| * | | | | | Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-configJunio C Hamano2011-05-061-15/+26
| |/ / / / /
* | | | | | Merge branch 'maint'Junio C Hamano2011-05-141-2/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | add, merge, diff: do not use strcasecmp to compare config variable namesJonathan Nieder2011-05-141-2/+2
| * | | | | Merge branch 'js/blame-parsename' into maintJunio C Hamano2011-05-131-1/+1
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'bf/commit-template-no-cleanup'Junio C Hamano2011-05-131-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Do not strip empty lines / trailing spaces from a commit message templateBoris Faure2011-05-111-1/+3
| |/ / / / / /
| * | | | | | Merge branch 'jc/pack-objects-bigfile' into maintJunio C Hamano2011-05-041-2/+6
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'mg/reflog-with-options' into maintJunio C Hamano2011-05-041-13/+17
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'rr/rerere-libify-clear-gc'Junio C Hamano2011-05-131-75/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | rerere: libify rerere_clear() and rerere_gc()Junio C Hamano2011-05-081-75/+2
* | | | | | | | | Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix'Junio C Hamano2011-05-131-0/+5
* | | | | | | | | Merge branch 'jc/fix-add-u-unmerged'Junio C Hamano2011-05-131-22/+23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix "add -u" that sometimes fails to resolve unmerged pathsJunio C Hamano2011-04-231-22/+23
* | | | | | | | | | Merge branch 'cn/log-parse-opt'Junio C Hamano2011-05-131-30/+44
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | log: convert to parse-optionsCarlos Martín Nieto2011-04-141-30/+43
* | | | | | | | | | | Merge branch 'jc/maint-branch-mergeoptions'Junio C Hamano2011-05-111-15/+26
* | | | | | | | | | | Merge branch 'jc/maint-add-p-overlapping-hunks'Junio C Hamano2011-05-111-3/+6
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | "add -p": work-around an old laziness that does not coalesce hunksJunio C Hamano2011-04-291-3/+6
* | | | | | | | | | | Merge branch 'js/blame-parsename'Junio C Hamano2011-05-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | blame: tolerate bogus e-mail addresses a bit betterJosh Stone2011-04-291-1/+1
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'nd/struct-pathspec'Junio C Hamano2011-05-065-17/+26
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | pathspec: rename per-item field has_wildcard to use_wildcardJunio C Hamano2011-04-052-2/+3
| * | | | | | | | | | Improve tree_entry_interesting() handling codeNguyễn Thái Ngọc Duy2011-03-251-6/+6
| * | | | | | | | | | Convert read_tree{,_recursive} to support struct pathspecNguyễn Thái Ngọc Duy2011-03-254-11/+19
* | | | | | | | | | | Merge branch 'mg/rev-list-count-cherry'Junio C Hamano2011-05-041-2/+8
|\ \ \ \ \ \ \ \ \ \ \