summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Git 1.7.10.2v1.7.10.2Junio C Hamano2012-05-113-2/+17
* Merge branch 'jc/diff-algo-cleanup' into maintJunio C Hamano2012-05-118-25/+24
|\
| * xdiff: PATIENCE/HISTOGRAM are not independent option bitsjc/diff-algo-cleanupJunio C Hamano2012-02-198-20/+24
| * xdiff: remove XDL_PATCH_* macrosJunio C Hamano2012-02-191-5/+0
* | Merge branch 'ct/advise-push-default' into maintJunio C Hamano2012-05-1110-13/+99
|\ \
| * | Fix httpd tests that broke when non-ff push advice changedChristopher Tiwald2012-04-122-2/+2
| * | clean up struct ref's nonfastforward fieldct/advise-push-defaultJeff King2012-03-262-4/+3
| * | push: Provide situational hints for non-fast-forward errorsChristopher Tiwald2012-03-197-12/+99
* | | Merge branch 'js/fast-import-test-9300' into maintJunio C Hamano2012-05-111-34/+54
|\ \ \
| * | | t9300-fast-import: avoid 'exit' in test_expect_success snippetsJohannes Sixt2012-04-201-34/+54
* | | | Merge branch 'jk/repack-no-explode-objects-from-old-pack' into maintJunio C Hamano2012-05-117-53/+107
|\ \ \ \
| * | | | gc: use argv-array for sub-commandsJeff King2012-04-181-45/+33
| * | | | argv-array: add a new "pushl" methodJeff King2012-04-183-0/+17
| * | | | argv-array: refactor empty_argv initializationJeff King2012-04-182-3/+2
| * | | | gc: do not explode objects which will be immediately prunedJeff King2012-04-114-11/+61
| |/ / /
* | | | Merge branch 'ah/maint-grep-double-init' into maintJunio C Hamano2012-05-111-1/+1
|\ \ \ \
| * | | | grep.c: remove redundant line of codeAngus Hammond2012-05-071-1/+1
* | | | | Merge branch 'fa/maint-config-doc' into maintJunio C Hamano2012-05-111-5/+9
|\ \ \ \ \
| * | | | | Documentation/git-config: describe and clarify "--local <file>" optionFlorian Achleitner2012-05-071-5/+9
| |/ / / /
* | | | | Merge branch 'rs/unpack-trees-leakfix' into maintJunio C Hamano2012-05-111-10/+17
|\ \ \ \ \
| * | | | | unpack-trees: plug minor memory leakRené Scharfe2012-04-101-9/+16
| * | | | | unpack-trees: don't perform any index operation if we're not mergingRené Scharfe2012-04-101-1/+1
* | | | | | Merge branch 'sl/test-wc-l-line-count' into maintJunio C Hamano2012-05-1119-74/+65
|\ \ \ \ \ \
| * | | | | | tests: modernise style: more uses of test_line_countStefano Lattarini2012-04-1119-74/+65
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'rl/show-empty-prefix' into maintJunio C Hamano2012-05-112-1/+3
|\ \ \ \ \ \
| * | | | | | rev-parse --show-prefix: add in trailing newlineRoss Lagerwall2012-04-102-1/+3
| |/ / / / /
* | | | | | document submdule.$name.update=none option for gitmodulesHeiko Voigt2012-05-112-6/+6
* | | | | | Update draft release notes to 1.7.10.2Junio C Hamano2012-05-101-0/+25
* | | | | | Merge branch 'mm/include-userpath' into maintJunio C Hamano2012-05-103-1/+18
|\ \ \ \ \ \
| * | | | | | config: expand tildes in include.path variableJeff King2012-04-293-1/+18
| |/ / / / /
* | | | | | Merge branch 'cc/fix-missing-va-end-in-revert' into maintJunio C Hamano2012-05-101-0/+1
|\ \ \ \ \ \
| * | | | | | revert: add missing va_endChristian Couder2012-04-211-0/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'bw/test-fix-grep-gnuism' into maintJunio C Hamano2012-05-101-2/+2
|\ \ \ \ \ \
| * | | | | | t9400: fix gnuism in grepJunio C Hamano2012-04-191-2/+2
* | | | | | | Merge branch 'jk/http-backend-keep-committer-ident-env' into maintJunio C Hamano2012-05-103-13/+37
|\ \ \ \ \ \ \
| * | | | | | | http-backend: respect existing GIT_COMMITTER_* variablesJeff King2012-03-303-13/+37
* | | | | | | | Merge branch 'nl/rebase-i-cheat-sheet' into maintJunio C Hamano2012-05-101-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | rebase -i: remind that the lines are top-to-bottomnl/rebase-i-cheat-sheetJunio C Hamano2012-03-201-0/+2
* | | | | | | | | Merge branch 'bw/submodule-sed-solaris' into maintJunio C Hamano2012-05-101-2/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Avoid bug in Solaris xpg4/sed as used in submoduleBen Walton2012-04-091-2/+3
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/maint-push-progress' into maintJunio C Hamano2012-05-103-2/+39
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t5541: test more combinations of --progressJeff King2012-05-011-2/+25
| * | | | | | | | | teach send-pack about --[no-]progressJeff King2012-05-012-2/+13
| * | | | | | | | | send-pack: show progress when isatty(2)Jeff King2012-05-011-0/+3
* | | | | | | | | | Merge branch 'jc/rerere-train' into maintJunio C Hamano2012-05-101-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | contrib/rerere-train: use installed git-sh-setupJunio C Hamano2012-04-301-1/+1
* | | | | | | | | | | Merge branch 'lp/diffstat-with-graph' into maintJunio C Hamano2012-05-105-6/+131
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t4052: work around shells unable to set COLUMNS to 1Zbigniew Jędrzejewski-Szmek2012-04-271-2/+4
| * | | | | | | | | | | Merge branch 'zj/mksh-columns-breakage' into lp/diffstat-with-graphJunio C Hamano2012-04-271-0/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | test-lib: skip test with COLUMNS=1 under mkshZbigniew Jędrzejewski-Szmek2012-04-271-0/+1