Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jk/cherry-pick-root-with-resolve' into maint | Junio C Hamano | 2011-05-26 |
|\ | |||
| * | revert: allow reverting a root commit | Jeff King | 2011-05-16 |
| * | cherry-pick: handle root commits with external strategies | Jeff King | 2011-05-16 |
* | | Merge branch 'jk/git-connection-deadlock-fix' into maint | Junio C Hamano | 2011-05-26 |
* | | Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' into maint | Junio C Hamano | 2011-05-26 |
* | | init/clone: remove short option -L and document --separate-git-dir | Nguyen Thai Ngoc Duy | 2011-05-25 |
* | | Merge branch 'vr/merge-base-doc' into maint | Junio C Hamano | 2011-05-16 |
|\ \ | |||
| * | | Documentation: update to git-merge-base --octopus | Vincent van Ravesteijn | 2011-04-15 |
| * | | Merge branch 'jc/index-update-if-able' into maint | Junio C Hamano | 2011-04-03 |
| |\ \ | |||
| * \ \ | Merge branch 'lt/default-abbrev' into maint | Junio C Hamano | 2011-04-03 |
| |\ \ \ | |||
| * \ \ \ | Merge branch 'mm/maint-log-n-with-diff-filtering' into maint | Junio C Hamano | 2011-04-03 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge branch 'lp/config-vername-check' into maint | Junio C Hamano | 2011-04-03 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'jc/maint-apply-report-offset' into maint | Junio C Hamano | 2011-04-01 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge branch 'jc/maint-apply-no-double-patch' into maint | Junio C Hamano | 2011-04-01 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge "checkout ambiguous ref bugfix" into maint | Junio C Hamano | 2011-04-01 |
| |\ \ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ \ | Merge branch 'jc/fix-add-u-unmerged' into maint | Junio C Hamano | 2011-05-16 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | Fix "add -u" that sometimes fails to resolve unmerged paths | Junio C Hamano | 2011-04-23 |
* | | | | | | | | | | | Merge branch 'jc/maint-branch-mergeoptions' into maint | Junio C Hamano | 2011-05-16 |
* | | | | | | | | | | | Merge branch 'jc/maint-add-p-overlapping-hunks' into maint | Junio C Hamano | 2011-05-16 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||
| * | | | | | | | | | | "add -p": work-around an old laziness that does not coalesce hunks | Junio C Hamano | 2011-04-29 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||
* | | | | | | | | | | Merge branch 'cn/format-patch-quiet' into maint | Junio C Hamano | 2011-05-15 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | format-patch: don't pass on the --quiet flag | Carlos Martín Nieto | 2011-04-12 |
* | | | | | | | | | | | add, merge, diff: do not use strcasecmp to compare config variable names | Jonathan Nieder | 2011-05-14 |
* | | | | | | | | | | | Merge branch 'js/blame-parsename' into maint | Junio C Hamano | 2011-05-13 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | blame: tolerate bogus e-mail addresses a bit better | Josh Stone | 2011-04-29 |
* | | | | | | | | | | | | Merge branch 'jc/pack-objects-bigfile' into maint | Junio C Hamano | 2011-05-04 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | Teach core.bigfilethreashold to pack-objects | Junio C Hamano | 2011-04-05 |
* | | | | | | | | | | | | | Merge branch 'mg/reflog-with-options' into maint | Junio C Hamano | 2011-05-04 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | |||
| * | | | | | | | | | | | | reflog: fix overriding of command line options | Michael J Gruber | 2011-04-01 |
| * | | | | | | | | | | | | builtin/log.c: separate default and setup of cmd_log_init() | Michael J Gruber | 2011-04-01 |
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | |||
* | | | | | | | | | | | | revert: Hide '-r' option in default usage | Ramkumar Ramachandra | 2011-04-13 |
| |_|/ / / / / / / / / |/| | | | | | | | | | | |||
* | | | | | | | | | | | Merge branch 'jk/maint-remote-mirror-safer' | Junio C Hamano | 2011-04-06 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | remote: deprecate --mirror | Jeff King | 2011-03-30 |
| * | | | | | | | | | | | remote: separate the concept of push and fetch mirrors | Jeff King | 2011-03-30 |
| * | | | | | | | | | | | remote: disallow some nonsensical option combinations | Jeff King | 2011-03-30 |
| |/ / / / / / / / / / | |||
* | | | | | | | | | | | Merge branch 'jl/submodule-fetch-on-demand' | Junio C Hamano | 2011-04-04 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | fetch/pull: Add the 'on-demand' value to the --recurse-submodules option | Jens Lehmann | 2011-03-09 |
| * | | | | | | | | | | | fetch/pull: recurse into submodules when necessary | Jens Lehmann | 2011-03-09 |
* | | | | | | | | | | | | sparse: Fix errors and silence warnings | Stephen Boyd | 2011-04-03 |
* | | | | | | | | | | | | Merge branch 'nd/init-gitdir' | Junio C Hamano | 2011-04-01 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | init, clone: support --separate-git-dir for .git file | Nguyễn Thái Ngọc Duy | 2011-03-19 |
* | | | | | | | | | | | | | Merge branch 'jc/merge-sans-branch' | Junio C Hamano | 2011-04-01 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | merge: merge with the default upstream branch without argument | Junio C Hamano | 2011-03-24 |
| * | | | | | | | | | | | | | merge: match the help text with the documentation | Jared Hance | 2011-03-24 |
* | | | | | | | | | | | | | | Merge branch 'jr/grep-en-config' | Junio C Hamano | 2011-04-01 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | grep: allow -E and -n to be turned on by default via configuration | Joe Ratterman | 2011-03-30 |
* | | | | | | | | | | | | | | | Merge branch 'ab/i18n-st' | Junio C Hamano | 2011-04-01 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | i18n: git-shortlog basic messages | Ævar Arnfjörð Bjarmason | 2011-03-09 |
| * | | | | | | | | | | | | | | | i18n: git-revert split up "could not revert/apply" message | Ævar Arnfjörð Bjarmason | 2011-03-09 |
| * | | | | | | | | | | | | | | | i18n: git-revert literal "me" messages | Ævar Arnfjörð Bjarmason | 2011-03-09 |