Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | | | | | Merge branch 'nd/init-gitdir' | Junio C Hamano | 2011-04-01 | 2 | -4/+72 |
|\ \ \ \ \ | |||||
| * | | | | | init, clone: support --separate-git-dir for .git file | Nguyễn Thái Ngọc Duy | 2011-03-19 | 2 | -4/+72 |
* | | | | | | Merge branch 'jc/merge-sans-branch' | Junio C Hamano | 2011-04-01 | 1 | -2/+40 |
|\ \ \ \ \ \ | |||||
| * | | | | | | merge: merge with the default upstream branch without argument | Junio C Hamano | 2011-03-24 | 1 | -1/+38 |
| * | | | | | | merge: match the help text with the documentation | Jared Hance | 2011-03-24 | 1 | -2/+3 |
* | | | | | | | Merge branch 'jr/grep-en-config' | Junio C Hamano | 2011-04-01 | 1 | -0/+13 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | grep: allow -E and -n to be turned on by default via configuration | Joe Ratterman | 2011-03-30 | 1 | -0/+13 |
* | | | | | | | | Merge branch 'ab/i18n-st' | Junio C Hamano | 2011-04-01 | 24 | -661/+694 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | i18n: git-shortlog basic messages | Ævar Arnfjörð Bjarmason | 2011-03-09 | 1 | -4/+4 |
| * | | | | | | | | i18n: git-revert split up "could not revert/apply" message | Ævar Arnfjörð Bjarmason | 2011-03-09 | 1 | -2/+3 |
| * | | | | | | | | i18n: git-revert literal "me" messages | Ævar Arnfjörð Bjarmason | 2011-03-09 | 1 | -2/+5 |
| * | | | | | | | | i18n: git-revert "Your local changes" message | Ævar Arnfjörð Bjarmason | 2011-03-09 | 1 | -5/+13 |
| * | | | | | | | | i18n: git-revert basic messages | Ævar Arnfjörð Bjarmason | 2011-03-09 | 1 | -23/+23 |
| * | | | | | | | | i18n: git-notes GIT_NOTES_REWRITE_MODE error message | Ævar Arnfjörð Bjarmason | 2011-03-09 | 1 | -2/+4 |
| * | | | | | | | | i18n: git-notes basic commands | Ævar Arnfjörð Bjarmason | 2011-03-09 | 1 | -53/+53 |
| * | | | | | | | | i18n: git-gc "Auto packing the repository" message | Ævar Arnfjörð Bjarmason | 2011-03-09 | 1 | -7/+7 |
| * | | | | | | | | i18n: git-gc basic messages | Ævar Arnfjörð Bjarmason | 2011-03-09 | 1 | -5/+5 |
| * | | | | | | | | i18n: git-describe basic messages | Ævar Arnfjörð Bjarmason | 2011-03-09 | 1 | -18/+18 |
| * | | | | | | | | i18n: git-clean clean.requireForce messages | Ævar Arnfjörð Bjarmason | 2011-03-09 | 1 | -3/+8 |
| * | | | | | | | | i18n: git-clean basic messages | Ævar Arnfjörð Bjarmason | 2011-03-09 | 1 | -10/+10 |
| * | | | | | | | | i18n: git-bundle basic messages | Ævar Arnfjörð Bjarmason | 2011-03-09 | 1 | -3/+3 |