summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* git-stash: remove untracked/ignored directories when stashedbc/unstash-clean-cruftsBrandon Casey2011-08-272-4/+24
* t/t3905: add missing '&&' linkageBrandon Casey2011-08-271-3/+3
* git-stash.sh: fix typo in error messageBrandon Casey2011-08-271-1/+1
* t/t3905: use the name 'actual' for test output, swap arguments to test_cmpBrandon Casey2011-08-271-12/+12
* stash: Add --include-untracked option to stash and remove all untracked filesDavid Caldwell2011-06-263-6/+227
* Merge branch 'maint-1.7.4' into maintJunio C Hamano2011-06-241-1/+1
|\
| * completion: replace core.abbrevguard to core.abbrevNamhyung Kim2011-06-241-1/+1
* | Documentation: git diff --check respects core.whitespaceChristof Krüger2011-06-221-4/+8
* | gitweb: 'pickaxe' and 'grep' features requires 'search' to be enabledJakub Narebski2011-06-211-0/+2
* | builtin/gc.c: add missing newline in messageAndreas Schwab2011-06-191-1/+1
* | fetch: do not leak a refspecJim Meyering2011-06-081-2/+4
* | Git 1.7.5.4v1.7.5.4Junio C Hamano2011-06-013-2/+6
* | Merge branch 'jk/maint-config-alias-fix' into maintJunio C Hamano2011-06-014-48/+30
|\ \
| * | handle_options(): do not miscount how many arguments were usedJunio C Hamano2011-05-242-5/+3
| * | config: always parse GIT_CONFIG_PARAMETERS during git_configJeff King2011-05-242-40/+18
| * | git_config: don't peek at global config_parametersJeff King2011-05-241-4/+11
| * | config: make environment parsing routines staticJeff King2011-05-242-4/+2
* | | Merge branch 'jc/fmt-req-fix' into maintJunio C Hamano2011-06-011-1/+1
|\ \ \
| * | | userformat_find_requirements(): find requirement for the correct formatJunio C Hamano2011-05-251-1/+1
* | | | Merge branch 'jk/maint-docs' into maintJunio C Hamano2011-06-014-15/+35
|\ \ \ \
| * | | | docs: fix some antique example outputJeff King2011-05-262-4/+4
| * | | | docs: make sure literal "->" isn't converted to arrowJeff King2011-05-262-5/+5
| * | | | docs: update status --porcelain formatJeff King2011-05-261-4/+23
| * | | | docs: minor grammar fixes to git-statusJeff King2011-05-261-3/+4
* | | | | Merge branch 'jn/doc-remote-helpers' into maintJunio C Hamano2011-06-011-3/+3
|\ \ \ \ \
| * | | | | Documentation: do not misinterpret refspecs as bold textJonathan Nieder2011-05-301-3/+3
* | | | | | Merge branch 'kk/maint-prefix-in-config-mak' into maintJunio C Hamano2011-06-011-0/+1
|\ \ \ \ \ \
| * | | | | | config.mak.in: allow "configure --sysconfdir=/else/where"Junio C Hamano2011-05-271-0/+1
* | | | | | | diffcore-rename.c: avoid set-but-not-used warningJim Meyering2011-06-011-2/+1
* | | | | | | Start 1.7.5.4 draft release notesJunio C Hamano2011-05-312-1/+19
* | | | | | | Merge branch 'tr/add-i-no-escape' into maintJunio C Hamano2011-05-311-0/+19
|\ \ \ \ \ \ \
| * | | | | | | add -i: ignore terminal escape sequencesThomas Rast2011-05-171-0/+19
* | | | | | | | Merge branch 'vh/config-interactive-singlekey-doc' into maintJunio C Hamano2011-05-315-13/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | git-reset.txt: better docs for '--patch'Valentin Haenel2011-05-051-3/+4
| * | | | | | | | git-checkout.txt: better docs for '--patch'Valentin Haenel2011-05-051-3/+4
| * | | | | | | | git-stash.txt: better docs for '--patch'Valentin Haenel2011-05-051-4/+5
| * | | | | | | | git-add.txt: document 'interactive.singlekey'Valentin Haenel2011-05-051-1/+5
| * | | | | | | | config.txt: 'interactive.singlekey; is used by...Valentin Haenel2011-05-051-2/+3
* | | | | | | | | Merge branch 'ml/test-readme' into maintJunio C Hamano2011-05-311-8/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t/README: unify documentation of test function argsMathias Lafeldt2011-04-261-8/+9
| |/ / / / / / / /
* | | | | | | | | Merge branch 'ab/i18n-fixup' into maintJunio C Hamano2011-05-3140-383/+375
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811Junio C Hamano2011-04-144-19/+10
| * | | | | | | | | i18n: use test_i18n{grep,cmp} in t7508Junio C Hamano2011-04-141-120/+102
| * | | | | | | | | i18n: use test_i18ngrep in t7506Junio C Hamano2011-04-141-28/+28
| * | | | | | | | | i18n: use test_i18ngrep and test_i18ncmp in t7502Junio C Hamano2011-04-131-41/+31
| * | | | | | | | | i18n: use test_i18ngrep in t7501Junio C Hamano2011-04-131-3/+4
| * | | | | | | | | i18n: use test_i18ncmp in t7500Junio C Hamano2011-04-131-5/+5
| * | | | | | | | | i18n: use test_i18ngrep in t7201Junio C Hamano2011-04-131-7/+7
| * | | | | | | | | i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110Junio C Hamano2011-04-132-8/+8
| * | | | | | | | | i18n: use test_i18ncmp and test_i18ngrep in t5541, t6040, t6120, t7004, t7012...Junio C Hamano2011-04-136-17/+15