summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | Merge branch 'nd/init-gitdir'Junio C Hamano2011-04-012-4/+72
|\ \ \ \
| * | | | init, clone: support --separate-git-dir for .git fileNguyễn Thái Ngọc Duy2011-03-192-4/+72
* | | | | Merge branch 'jc/merge-sans-branch'Junio C Hamano2011-04-011-2/+40
|\ \ \ \ \
| * | | | | merge: merge with the default upstream branch without argumentJunio C Hamano2011-03-241-1/+38
| * | | | | merge: match the help text with the documentationJared Hance2011-03-241-2/+3
* | | | | | Merge branch 'jr/grep-en-config'Junio C Hamano2011-04-011-0/+13
|\ \ \ \ \ \
| * | | | | | grep: allow -E and -n to be turned on by default via configurationJoe Ratterman2011-03-301-0/+13
* | | | | | | Merge branch 'ab/i18n-st'Junio C Hamano2011-04-0124-661/+694
|\ \ \ \ \ \ \
| * | | | | | | i18n: git-shortlog basic messagesÆvar Arnfjörð Bjarmason2011-03-091-4/+4
| * | | | | | | i18n: git-revert split up "could not revert/apply" messageÆvar Arnfjörð Bjarmason2011-03-091-2/+3
| * | | | | | | i18n: git-revert literal "me" messagesÆvar Arnfjörð Bjarmason2011-03-091-2/+5
| * | | | | | | i18n: git-revert "Your local changes" messageÆvar Arnfjörð Bjarmason2011-03-091-5/+13
| * | | | | | | i18n: git-revert basic messagesÆvar Arnfjörð Bjarmason2011-03-091-23/+23
| * | | | | | | i18n: git-notes GIT_NOTES_REWRITE_MODE error messageÆvar Arnfjörð Bjarmason2011-03-091-2/+4
| * | | | | | | i18n: git-notes basic commandsÆvar Arnfjörð Bjarmason2011-03-091-53/+53
| * | | | | | | i18n: git-gc "Auto packing the repository" messageÆvar Arnfjörð Bjarmason2011-03-091-7/+7
| * | | | | | | i18n: git-gc basic messagesÆvar Arnfjörð Bjarmason2011-03-091-5/+5
| * | | | | | | i18n: git-describe basic messagesÆvar Arnfjörð Bjarmason2011-03-091-18/+18
| * | | | | | | i18n: git-clean clean.requireForce messagesÆvar Arnfjörð Bjarmason2011-03-091-3/+8
| * | | | | | | i18n: git-clean basic messagesÆvar Arnfjörð Bjarmason2011-03-091-10/+10
| * | | | | | | i18n: git-bundle basic messagesÆvar Arnfjörð Bjarmason2011-03-091-3/+3
| * | | | | | | i18n: git-archive basic messagesÆvar Arnfjörð Bjarmason2011-03-091-7/+7
| * | | | | | | i18n: git-push "prevent you from losing" messageÆvar Arnfjörð Bjarmason2011-03-091-2/+2
| * | | | | | | i18n: git-push basic messagesÆvar Arnfjörð Bjarmason2011-03-091-19/+19