Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mk/grep-pcre' | Junio C Hamano | 2011-05-30 | 1 | -9/+43 |
|\ | |||||
| * | git-grep: do not die upon -F/-P when grep.extendedRegexp is set. | Junio C Hamano | 2011-05-09 | 1 | -13/+43 |
| * | git-grep: Bail out when -P is used with -F or -E | Michał Kiedrowicz | 2011-05-09 | 1 | -1/+3 |
| * | git-grep: Learn PCRE | Michał Kiedrowicz | 2011-05-09 | 1 | -0/+2 |
* | | Merge branch 'jc/notes-batch-removal' | Junio C Hamano | 2011-05-29 | 2 | -22/+43 |
|\ \ | |||||
| * | | show: --ignore-missing | Junio C Hamano | 2011-05-19 | 1 | -0/+1 |
| * | | notes remove: --stdin reads from the standard input | Junio C Hamano | 2011-05-19 | 1 | -4/+15 |
| * | | notes remove: --ignore-missing | Junio C Hamano | 2011-05-19 | 1 | -4/+10 |
| * | | notes remove: allow removing more than one | Junio C Hamano | 2011-05-19 | 1 | -22/+25 |
* | | | Merge branch 'jk/haves-from-alternate-odb' | Junio C Hamano | 2011-05-29 | 2 | -4/+14 |
|\ \ \ | |||||
| * | | | receive-pack: eliminate duplicate .have refs | Jeff King | 2011-05-19 | 1 | -3/+13 |
| * | | | refactor refs_from_alternate_cb to allow passing extra data | Jeff King | 2011-05-19 | 2 | -2/+2 |
* | | | | Merge branch 'jk/fetch-mark-complete-optimization' | Junio C Hamano | 2011-05-26 | 1 | -2/+4 |
|\ \ \ \ | |||||
| * | | | | fetch: avoid repeated commits in mark_complete | Jeff King | 2011-05-19 | 1 | -2/+4 |
| |/ / / | |||||
* | | | | Merge branch 'jc/bigfile' | Junio C Hamano | 2011-05-25 | 2 | -2/+6 |
|\ \ \ \ | |||||
| * | | | | index_fd(): turn write_object and format_check arguments into one flag | Junio C Hamano | 2011-05-09 | 2 | -2/+6 |
* | | | | | Merge branch 'js/log-abbrev-commit-config' | Junio C Hamano | 2011-05-25 | 1 | -9/+18 |
|\ \ \ \ \ | |||||
| * | | | | | Add log.abbrevCommit config variable | Jay Soffian | 2011-05-18 | 1 | -8/+17 |
| * | | | | | "git log -h": typofix misspelled 'suppress' | Jay Soffian | 2011-05-18 | 1 | -1/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'maint' | Junio C Hamano | 2011-05-25 | 2 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | init/clone: remove short option -L and document --separate-git-dir | Nguyen Thai Ngoc Duy | 2011-05-25 | 2 | -2/+2 |
| | |_|/ / | |/| | | | |||||
| * | | | | Merge branch 'vr/merge-base-doc' into maint | Junio C Hamano | 2011-05-16 | 1 | -1/+2 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jc/fix-add-u-unmerged' into maint | Junio C Hamano | 2011-05-16 | 1 | -22/+23 |
| |\ \ \ \ \ | |||||
| * | | | | | | Merge branch 'jc/maint-branch-mergeoptions' into maint | Junio C Hamano | 2011-05-16 | 1 | -15/+26 |
| * | | | | | | Merge branch 'jc/maint-add-p-overlapping-hunks' into maint | Junio C Hamano | 2011-05-16 | 1 | -3/+6 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | 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 |