summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'vr/merge-base-doc'Junio C Hamano2011-05-041-1/+2
|\
| * Documentation: update to git-merge-base --octopusVincent van Ravesteijn2011-04-151-1/+2
| * Merge branch 'jc/index-update-if-able' into maintJunio C Hamano2011-04-032-13/+3
| |\
| * \ Merge branch 'lt/default-abbrev' into maintJunio C Hamano2011-04-031-1/+5
| |\ \
| * \ \ Merge branch 'mm/maint-log-n-with-diff-filtering' into maintJunio C Hamano2011-04-031-1/+7
| |\ \ \
| * \ \ \ Merge branch 'lp/config-vername-check' into maintJunio C Hamano2011-04-031-7/+20
| |\ \ \ \
| * \ \ \ \ Merge branch 'jc/maint-apply-report-offset' into maintJunio C Hamano2011-04-011-2/+14
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jc/maint-apply-no-double-patch' into maintJunio C Hamano2011-04-011-1/+6
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge "checkout ambiguous ref bugfix" into maintJunio C Hamano2011-04-011-10/+13
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'jk/notes-ui-updates'Junio C Hamano2011-05-021-10/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | notes: make expand_notes_ref globally accessibleJeff King2011-03-291-10/+0
* | | | | | | | | | Merge branch 'ab/i18n-fixup'Junio C Hamano2011-05-024-20/+32
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | i18n: mark init-db messages for translationÆvar Arnfjörð Bjarmason2011-04-121-5/+5
| * | | | | | | | | | i18n: mark checkout plural warning for translationÆvar Arnfjörð Bjarmason2011-04-121-3/+15
| * | | | | | | | | | i18n: mark checkout --detach messages for translationÆvar Arnfjörð Bjarmason2011-04-121-3/+3
| * | | | | | | | | | i18n: mark clone nonexistent repository message for translationÆvar Arnfjörð Bjarmason2011-04-121-1/+1
| * | | | | | | | | | i18n: mark merge CHERRY_PICK_HEAD messages for translationÆvar Arnfjörð Bjarmason2011-04-121-3/+3
| * | | | | | | | | | i18n: mark merge "upstream" messages for translationÆvar Arnfjörð Bjarmason2011-04-121-4/+4
| * | | | | | | | | | i18n: mark merge "Could not read from" message for translationÆvar Arnfjörð Bjarmason2011-04-121-1/+1
* | | | | | | | | | | Merge branch 'jh/notes-add-ui'Junio C Hamano2011-05-021-3/+17
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Make "git notes add" more user-friendly when there are existing notesJohan Herland2011-03-301-3/+17
* | | | | | | | | | | | Merge branch 'jc/rename-degrade-cc-to-c'Junio C Hamano2011-04-283-4/+21
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | diffcore-rename: fall back to -C when -C -C busts the rename limitJunio C Hamano2011-03-222-1/+20
| * | | | | | | | | | | | builtin/diff.c: remove duplicated call to diff_result_code()Junio C Hamano2011-03-221-3/+1
* | | | | | | | | | | | | Merge branch 'cn/format-patch-quiet'Junio C Hamano2011-04-271-6/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | format-patch: don't pass on the --quiet flagCarlos Martín Nieto2011-04-121-6/+10
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jc/merge-dash-previous'Junio C Hamano2011-04-271-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | merge: allow "-" as a short-hand for "previous branch"Junio C Hamano2011-04-071-3/+6
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'rj/sparse'Junio C Hamano2011-04-273-6/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | sparse: Fix an "symbol 'merge_file' not decared" warningRamsay Jones2011-04-111-2/+1
| * | | | | | | | | | | | | sparse: Fix an "symbol 'format_subject' not declared" warningRamsay Jones2011-04-111-3/+0
| * | | | | | | | | | | | | sparse: Fix an "symbol 'cmd_index_pack' not declared" warningRamsay Jones2011-04-111-1/+1
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'nk/blame-abbrev'Junio C Hamano2011-04-271-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | blame: add --abbrev command line option and make it honor core.abbrevNamhyung Kim2011-04-051-1/+8
* | | | | | | | | | | | | | Merge branch 'dm/color-palette'Junio C Hamano2011-04-271-13/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Share color list between graph and show-branchDan McGee2011-04-041-13/+3
* | | | | | | | | | | | | | | Merge branch 'jc/pack-objects-bigfile'Junio C Hamano2011-04-271-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Teach core.bigfilethreashold to pack-objectsJunio C Hamano2011-04-051-2/+6
* | | | | | | | | | | | | | | | Merge branch 'mg/reflog-with-options'Junio C Hamano2011-04-271-13/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | reflog: fix overriding of command line optionsMichael J Gruber2011-04-011-7/+2
| * | | | | | | | | | | | | | | | builtin/log.c: separate default and setup of cmd_log_init()Michael J Gruber2011-04-011-6/+15
| | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | revert: Hide '-r' option in default usageRamkumar Ramachandra2011-04-131-1/+2
| |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jk/maint-remote-mirror-safer'Junio C Hamano2011-04-061-13/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | remote: deprecate --mirrorJeff King2011-03-301-1/+7
| * | | | | | | | | | | | | | remote: separate the concept of push and fetch mirrorsJeff King2011-03-301-13/+38
| * | | | | | | | | | | | | | remote: disallow some nonsensical option combinationsJeff King2011-03-301-0/+5
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'jl/submodule-fetch-on-demand'Junio C Hamano2011-04-041-12/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | fetch/pull: Add the 'on-demand' value to the --recurse-submodules optionJens Lehmann2011-03-091-3/+19
| * | | | | | | | | | | | | fetch/pull: recurse into submodules when necessaryJens Lehmann2011-03-091-9/+17
* | | | | | | | | | | | | | sparse: Fix errors and silence warningsStephen Boyd2011-04-033-5/+5