Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ms/ls-remote-exit-with-status' | Junio C Hamano | 2011-05-23 | 1 | -2/+9 |
|\ | |||||
| * | ls-remote: the --exit-code option reports "no matching refs" | Michael Schubert | 2011-05-18 | 1 | -2/+9 |
* | | Merge branch 'mg/config-symbolic-constants' | Junio C Hamano | 2011-05-23 | 1 | -1/+6 |
|\ \ | |||||
| * | | config: Give error message when not changing a multivar | Michael J Gruber | 2011-05-17 | 1 | -1/+6 |
| |/ | |||||
* | | Merge branch 'jc/magic-pathspec' | Junio C Hamano | 2011-05-23 | 1 | -7/+1 |
|\ \ | |||||
| * | | grep: use get_pathspec() correctly | Junio C Hamano | 2011-05-10 | 1 | -7/+1 |
* | | | Merge branch 'jk/blame-line-porcelain' | Junio C Hamano | 2011-05-23 | 1 | -10/+23 |
|\ \ \ | |||||
| * | | | blame: add --line-porcelain output format | Jeff King | 2011-05-09 | 1 | -2/+8 |
| * | | | blame: refactor porcelain output | Jeff King | 2011-05-09 | 1 | -9/+16 |
* | | | | Merge branch 'jc/replacing' | Junio C Hamano | 2011-05-19 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | read_sha1_file(): get rid of read_sha1_file_repl() madness | Junio C Hamano | 2011-05-15 | 1 | -2/+2 |
| |/ / / | |||||
* | | | | Merge branch 'ms/tagname-does-not-begin-with-dash' | Junio C Hamano | 2011-05-19 | 1 | -8/+18 |
|\ \ \ \ | |||||
| * | | | | tag: disallow '-' as tag name | Michael Schubert | 2011-05-10 | 1 | -8/+18 |
* | | | | | Merge branch 'jk/git-connection-deadlock-fix' | Junio C Hamano | 2011-05-19 | 1 | -0/+2 |
* | | | | | Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' | Junio C Hamano | 2011-05-19 | 1 | -2/+2 |
* | | | | | Merge branch 'jk/cherry-pick-root-with-resolve' | Junio C Hamano | 2011-05-19 | 2 | -5/+11 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | revert: allow reverting a root commit | Jeff King | 2011-05-16 | 1 | -3/+1 |
| * | | | | cherry-pick: handle root commits with external strategies | Jeff King | 2011-05-16 | 1 | -2/+10 |
| * | | | | Merge branch 'cn/format-patch-quiet' into maint | Junio C Hamano | 2011-05-15 | 1 | -6/+10 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'ci/commit--interactive-atomic' | Junio C Hamano | 2011-05-16 | 2 | -15/+37 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add support for -p/--patch to git-commit | Conrad Irwin | 2011-05-09 | 2 | -6/+10 |
| * | | | | | | Allow git commit --interactive with paths | Conrad Irwin | 2011-05-09 | 1 | -2/+0 |
| * | | | | | | Use a temporary index for git commit --interactive | Conrad Irwin | 2011-05-08 | 1 | -8/+28 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'mg/merge-ff-config' | Junio C Hamano | 2011-05-16 | 1 | -0/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | merge: introduce merge.ff configuration variable | Junio C Hamano | 2011-05-06 | 1 | -0/+9 |
| * | | | | | | Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config | Junio C Hamano | 2011-05-06 | 1 | -15/+26 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-05-14 | 1 | -2/+2 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | add, merge, diff: do not use strcasecmp to compare config variable names | Jonathan Nieder | 2011-05-14 | 1 | -2/+2 |
| * | | | | | Merge branch 'js/blame-parsename' into maint | Junio C Hamano | 2011-05-13 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | Merge branch 'bf/commit-template-no-cleanup' | Junio C Hamano | 2011-05-13 | 1 | -1/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Do not strip empty lines / trailing spaces from a commit message template | Boris Faure | 2011-05-11 | 1 | -1/+3 |
| |/ / / / / / | |||||
| * | | | | | | Merge branch 'jc/pack-objects-bigfile' into maint | Junio C Hamano | 2011-05-04 | 1 | -2/+6 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'mg/reflog-with-options' into maint | Junio C Hamano | 2011-05-04 | 1 | -13/+17 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'rr/rerere-libify-clear-gc' | Junio C Hamano | 2011-05-13 | 1 | -75/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | rerere: libify rerere_clear() and rerere_gc() | Junio C Hamano | 2011-05-08 | 1 | -75/+2 |
* | | | | | | | | | Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' | Junio C Hamano | 2011-05-13 | 1 | -0/+5 |
* | | | | | | | | | Merge branch 'jc/fix-add-u-unmerged' | Junio C Hamano | 2011-05-13 | 1 | -22/+23 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix "add -u" that sometimes fails to resolve unmerged paths | Junio C Hamano | 2011-04-23 | 1 | -22/+23 |
* | | | | | | | | | | Merge branch 'cn/log-parse-opt' | Junio C Hamano | 2011-05-13 | 1 | -30/+44 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | log: convert to parse-options | Carlos Martín Nieto | 2011-04-14 | 1 | -30/+43 |
* | | | | | | | | | | | Merge branch 'jc/maint-branch-mergeoptions' | Junio C Hamano | 2011-05-11 | 1 | -15/+26 |
* | | | | | | | | | | | Merge branch 'jc/maint-add-p-overlapping-hunks' | Junio C Hamano | 2011-05-11 | 1 | -3/+6 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | "add -p": work-around an old laziness that does not coalesce hunks | Junio C Hamano | 2011-04-29 | 1 | -3/+6 |
* | | | | | | | | | | | Merge branch 'js/blame-parsename' | Junio C Hamano | 2011-05-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | blame: tolerate bogus e-mail addresses a bit better | Josh Stone | 2011-04-29 | 1 | -1/+1 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'nd/struct-pathspec' | Junio C Hamano | 2011-05-06 | 5 | -17/+26 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | pathspec: rename per-item field has_wildcard to use_wildcard | Junio C Hamano | 2011-04-05 | 2 | -2/+3 |
| * | | | | | | | | | | Improve tree_entry_interesting() handling code | Nguyễn Thái Ngọc Duy | 2011-03-25 | 1 | -6/+6 |
| * | | | | | | | | | | Convert read_tree{,_recursive} to support struct pathspec | Nguyễn Thái Ngọc Duy | 2011-03-25 | 4 | -11/+19 |
* | | | | | | | | | | | Merge branch 'mg/rev-list-count-cherry' | Junio C Hamano | 2011-05-04 | 1 | -2/+8 |
|\ \ \ \ \ \ \ \ \ \ \ |