aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
...
| * | | | | | | | | | | | | | config: Give error message when not changing a multivarMichael J Gruber2011-05-17
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'jc/magic-pathspec'Junio C Hamano2011-05-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | grep: use get_pathspec() correctlyJunio C Hamano2011-05-10
* | | | | | | | | | | | | | | Merge branch 'jk/blame-line-porcelain'Junio C Hamano2011-05-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | blame: add --line-porcelain output formatJeff King2011-05-09
| * | | | | | | | | | | | | | | blame: refactor porcelain outputJeff King2011-05-09
* | | | | | | | | | | | | | | | Merge branch 'jc/replacing'Junio C Hamano2011-05-19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | read_sha1_file(): get rid of read_sha1_file_repl() madnessJunio C Hamano2011-05-15
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'ms/tagname-does-not-begin-with-dash'Junio C Hamano2011-05-19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | tag: disallow '-' as tag nameMichael Schubert2011-05-10
| | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'jk/git-connection-deadlock-fix'Junio C Hamano2011-05-19
* | | | | | | | | | | | | | | | Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix'Junio C Hamano2011-05-19
* | | | | | | | | | | | | | | | Merge branch 'jk/cherry-pick-root-with-resolve'Junio C Hamano2011-05-19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | / / / | | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | revert: allow reverting a root commitJeff King2011-05-16
| * | | | | | | | | | | | | | cherry-pick: handle root commits with external strategiesJeff King2011-05-16
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'cn/format-patch-quiet' into maintJunio C Hamano2011-05-15
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ci/commit--interactive-atomic'Junio C Hamano2011-05-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add support for -p/--patch to git-commitConrad Irwin2011-05-09
| * | | | | | | | | | | | | | | Allow git commit --interactive with pathsConrad Irwin2011-05-09
| * | | | | | | | | | | | | | | Use a temporary index for git commit --interactiveConrad Irwin2011-05-08
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'mg/merge-ff-config'Junio C Hamano2011-05-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | merge: introduce merge.ff configuration variableJunio C Hamano2011-05-06
| * | | | | | | | | | | | | | | Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-configJunio C Hamano2011-05-06
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-05-14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | add, merge, diff: do not use strcasecmp to compare config variable namesJonathan Nieder2011-05-14
| * | | | | | | | | | | | | | Merge branch 'js/blame-parsename' into maintJunio C Hamano2011-05-13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bf/commit-template-no-cleanup'Junio C Hamano2011-05-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Do not strip empty lines / trailing spaces from a commit message templateBoris Faure2011-05-11
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge branch 'jc/pack-objects-bigfile' into maintJunio C Hamano2011-05-04
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/reflog-with-options' into maintJunio C Hamano2011-05-04
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'rr/rerere-libify-clear-gc'Junio C Hamano2011-05-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | rerere: libify rerere_clear() and rerere_gc()Junio C Hamano2011-05-08
* | | | | | | | | | | | | | | | | | Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix'Junio C Hamano2011-05-13
* | | | | | | | | | | | | | | | | | Merge branch 'jc/fix-add-u-unmerged'Junio C Hamano2011-05-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fix "add -u" that sometimes fails to resolve unmerged pathsJunio C Hamano2011-04-23
* | | | | | | | | | | | | | | | | | Merge branch 'cn/log-parse-opt'Junio C Hamano2011-05-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | log: convert to parse-optionsCarlos Martín Nieto2011-04-14
* | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-branch-mergeoptions'Junio C Hamano2011-05-11
* | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-add-p-overlapping-hunks'Junio C Hamano2011-05-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | / / / / / / / | | |_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | "add -p": work-around an old laziness that does not coalesce hunksJunio C Hamano2011-04-29
* | | | | | | | | | | | | | | | | Merge branch 'js/blame-parsename'Junio C Hamano2011-05-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | blame: tolerate bogus e-mail addresses a bit betterJosh Stone2011-04-29
| | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'nd/struct-pathspec'Junio C Hamano2011-05-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | pathspec: rename per-item field has_wildcard to use_wildcardJunio C Hamano2011-04-05
| * | | | | | | | | | | | | | | | Improve tree_entry_interesting() handling codeNguyễn Thái Ngọc Duy2011-03-25
| * | | | | | | | | | | | | | | | Convert read_tree{,_recursive} to support struct pathspecNguyễn Thái Ngọc Duy2011-03-25
* | | | | | | | | | | | | | | | | Merge branch 'mg/rev-list-count-cherry'Junio C Hamano2011-05-04
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | rev-list --count: separate count for --cherry-markMichael J Gruber2011-04-26
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'vr/merge-base-doc'Junio C Hamano2011-05-04
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Documentation: update to git-merge-base --octopusVincent van Ravesteijn2011-04-15
| | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |