Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'vr/merge-base-doc' | Junio C Hamano | 2011-05-04 | 1 | -1/+2 |
|\ | |||||
| * | Documentation: update to git-merge-base --octopus | Vincent van Ravesteijn | 2011-04-15 | 1 | -1/+2 |
| * | Merge branch 'jc/index-update-if-able' into maint | Junio C Hamano | 2011-04-03 | 2 | -13/+3 |
| |\ | |||||
| * \ | Merge branch 'lt/default-abbrev' into maint | Junio C Hamano | 2011-04-03 | 1 | -1/+5 |
| |\ \ | |||||
| * \ \ | Merge branch 'mm/maint-log-n-with-diff-filtering' into maint | Junio C Hamano | 2011-04-03 | 1 | -1/+7 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'lp/config-vername-check' into maint | Junio C Hamano | 2011-04-03 | 1 | -7/+20 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jc/maint-apply-report-offset' into maint | Junio C Hamano | 2011-04-01 | 1 | -2/+14 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jc/maint-apply-no-double-patch' into maint | Junio C Hamano | 2011-04-01 | 1 | -1/+6 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge "checkout ambiguous ref bugfix" into maint | Junio C Hamano | 2011-04-01 | 1 | -10/+13 |
| |\ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ | Merge branch 'jk/notes-ui-updates' | Junio C Hamano | 2011-05-02 | 1 | -10/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | notes: make expand_notes_ref globally accessible | Jeff King | 2011-03-29 | 1 | -10/+0 |
* | | | | | | | | | | Merge branch 'ab/i18n-fixup' | Junio C Hamano | 2011-05-02 | 4 | -20/+32 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | i18n: mark init-db messages for translation | Ævar Arnfjörð Bjarmason | 2011-04-12 | 1 | -5/+5 |
| * | | | | | | | | | | i18n: mark checkout plural warning for translation | Ævar Arnfjörð Bjarmason | 2011-04-12 | 1 | -3/+15 |
| * | | | | | | | | | | i18n: mark checkout --detach messages for translation | Ævar Arnfjörð Bjarmason | 2011-04-12 | 1 | -3/+3 |
| * | | | | | | | | | | i18n: mark clone nonexistent repository message for translation | Ævar Arnfjörð Bjarmason | 2011-04-12 | 1 | -1/+1 |
| * | | | | | | | | | | i18n: mark merge CHERRY_PICK_HEAD messages for translation | Ævar Arnfjörð Bjarmason | 2011-04-12 | 1 | -3/+3 |
| * | | | | | | | | | | i18n: mark merge "upstream" messages for translation | Ævar Arnfjörð Bjarmason | 2011-04-12 | 1 | -4/+4 |
| * | | | | | | | | | | i18n: mark merge "Could not read from" message for translation | Ævar Arnfjörð Bjarmason | 2011-04-12 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'jh/notes-add-ui' | Junio C Hamano | 2011-05-02 | 1 | -3/+17 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Make "git notes add" more user-friendly when there are existing notes | Johan Herland | 2011-03-30 | 1 | -3/+17 |
* | | | | | | | | | | | | Merge branch 'jc/rename-degrade-cc-to-c' | Junio C Hamano | 2011-04-28 | 3 | -4/+21 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | diffcore-rename: fall back to -C when -C -C busts the rename limit | Junio C Hamano | 2011-03-22 | 2 | -1/+20 |
| * | | | | | | | | | | | | builtin/diff.c: remove duplicated call to diff_result_code() | Junio C Hamano | 2011-03-22 | 1 | -3/+1 |
* | | | | | | | | | | | | | Merge branch 'cn/format-patch-quiet' | Junio C Hamano | 2011-04-27 | 1 | -6/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | format-patch: don't pass on the --quiet flag | Carlos Martín Nieto | 2011-04-12 | 1 | -6/+10 |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'jc/merge-dash-previous' | Junio C Hamano | 2011-04-27 | 1 | -3/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | merge: allow "-" as a short-hand for "previous branch" | Junio C Hamano | 2011-04-07 | 1 | -3/+6 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge branch 'rj/sparse' | Junio C Hamano | 2011-04-27 | 3 | -6/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | sparse: Fix an "symbol 'merge_file' not decared" warning | Ramsay Jones | 2011-04-11 | 1 | -2/+1 |
| * | | | | | | | | | | | | | sparse: Fix an "symbol 'format_subject' not declared" warning | Ramsay Jones | 2011-04-11 | 1 | -3/+0 |
| * | | | | | | | | | | | | | sparse: Fix an "symbol 'cmd_index_pack' not declared" warning | Ramsay Jones | 2011-04-11 | 1 | -1/+1 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge branch 'nk/blame-abbrev' | Junio C Hamano | 2011-04-27 | 1 | -1/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | blame: add --abbrev command line option and make it honor core.abbrev | Namhyung Kim | 2011-04-05 | 1 | -1/+8 |
* | | | | | | | | | | | | | | Merge branch 'dm/color-palette' | Junio C Hamano | 2011-04-27 | 1 | -13/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Share color list between graph and show-branch | Dan McGee | 2011-04-04 | 1 | -13/+3 |
* | | | | | | | | | | | | | | | Merge branch 'jc/pack-objects-bigfile' | Junio C Hamano | 2011-04-27 | 1 | -2/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Teach core.bigfilethreashold to pack-objects | Junio C Hamano | 2011-04-05 | 1 | -2/+6 |
* | | | | | | | | | | | | | | | | Merge branch 'mg/reflog-with-options' | Junio C Hamano | 2011-04-27 | 1 | -13/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | reflog: fix overriding of command line options | Michael J Gruber | 2011-04-01 | 1 | -7/+2 |
| * | | | | | | | | | | | | | | | | builtin/log.c: separate default and setup of cmd_log_init() | Michael J Gruber | 2011-04-01 | 1 | -6/+15 |
| | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | revert: Hide '-r' option in default usage | Ramkumar Ramachandra | 2011-04-13 | 1 | -1/+2 |
| |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge branch 'jk/maint-remote-mirror-safer' | Junio C Hamano | 2011-04-06 | 1 | -13/+49 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | remote: deprecate --mirror | Jeff King | 2011-03-30 | 1 | -1/+7 |
| * | | | | | | | | | | | | | | remote: separate the concept of push and fetch mirrors | Jeff King | 2011-03-30 | 1 | -13/+38 |
| * | | | | | | | | | | | | | | remote: disallow some nonsensical option combinations | Jeff King | 2011-03-30 | 1 | -0/+5 |
| |/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | Merge branch 'jl/submodule-fetch-on-demand' | Junio C Hamano | 2011-04-04 | 1 | -12/+36 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | fetch/pull: Add the 'on-demand' value to the --recurse-submodules option | Jens Lehmann | 2011-03-09 | 1 | -3/+19 |
| * | | | | | | | | | | | | | fetch/pull: recurse into submodules when necessary | Jens Lehmann | 2011-03-09 | 1 | -9/+17 |
* | | | | | | | | | | | | | | sparse: Fix errors and silence warnings | Stephen Boyd | 2011-04-03 | 3 | -5/+5 |