summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | Merge branch 'us/printf-not-echo' into maintJunio C Hamano2014-04-032-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rr/doc-merge-strategies' into maintJunio C Hamano2014-04-031-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/shallow-update-fix' into maintJunio C Hamano2014-04-035-56/+49
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/stash-pop-not-popped' into maintJunio C Hamano2014-04-031-2/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/wt-status' into maintJunio C Hamano2014-04-033-55/+88
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'nd/gc-aggressive'Junio C Hamano2014-04-035-3/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | environment.c: fix constness for odb_pack_keep()nd/gc-aggressiveNguyễn Thái Ngọc Duy2014-03-312-2/+2
| * | | | | | | | | | | | | | | | | | | | gc --aggressive: make --depth configurableNguyễn Thái Ngọc Duy2014-03-313-1/+15
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/fix-diff-no-index-diff-opt-parse'Junio C Hamano2014-04-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | diff-no-index: correctly diagnose error return from diff_opt_parse()jc/fix-diff-no-index-diff-opt-parseJunio C Hamano2014-03-311-1/+1
* | | | | | | | | | | | | | | | | | | | | Merge branch 'cb/aix'Junio C Hamano2014-04-033-7/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | tests: don't rely on strerror text when testing rmdir failurecb/aixCharles Bailey2014-03-312-4/+2
| * | | | | | | | | | | | | | | | | | | | | dir.c: make git_fnmatch() not inlineCharles Bailey2014-03-311-3/+3
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'cn/fetch-prune-overlapping-destination'Junio C Hamano2014-04-032-6/+64
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | fetch: handle overlaping refspecs on --prunecn/fetch-prune-overlapping-destinationCarlos Martín Nieto2014-03-262-7/+45
| * | | | | | | | | | | | | | | | | | | | fetch: add a failing test for prunning with overlapping refspecsCarlos Martín Nieto2014-02-281-0/+20
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'nd/log-show-linear-break'Junio C Hamano2014-04-0314-11/+89
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | log: add --show-linear-break to help see non-linear historynd/log-show-linear-breakNguyễn Thái Ngọc Duy2014-03-255-5/+66
| * | | | | | | | | | | | | | | | | | | | object.h: centralize object flag allocationNguyễn Thái Ngọc Duy2014-03-2511-7/+24
* | | | | | | | | | | | | | | | | | | | | Merge branch 'ep/shell-command-substitution'Junio C Hamano2014-04-032-17/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | git-am.sh: use the $(...) construct for command substitutionElia Pinto2014-03-251-15/+15
| * | | | | | | | | | | | | | | | | | | | | check-builtins.sh: use the $(...) construct for command substitutionElia Pinto2014-03-251-2/+2
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'ap/remote-hg-skip-null-bookmarks'Junio C Hamano2014-04-022-1/+77
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | remote-hg: do not fail on invalid bookmarksap/remote-hg-skip-null-bookmarksMax Horn2014-03-252-1/+77
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/pickaxe-i'Junio C Hamano2014-04-022-188/+116
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | pickaxe: simplify kwset loop in contains()rs/pickaxe-iRené Scharfe2014-03-241-5/+2
| * | | | | | | | | | | | | | | | | | | | | | | pickaxe: call strlen only when necessary in diffcore_pickaxe_count()René Scharfe2014-03-241-2/+1
| * | | | | | | | | | | | | | | | | | | | | | | pickaxe: move pickaxe() after pickaxe_match()René Scharfe2014-03-241-41/+38
| * | | | | | | | | | | | | | | | | | | | | | | pickaxe: merge diffcore_pickaxe_grep() and diffcore_pickaxe_count() into diff...René Scharfe2014-03-241-37/+7
| * | | | | | | | | | | | | | | | | | | | | | | pickaxe: honor -i when used with -S and --pickaxe-regexRené Scharfe2014-03-242-1/+9
| * | | | | | | | | | | | | | | | | | | | | | | t4209: use helper functions to test --authorRené Scharfe2014-03-241-9/+4
| * | | | | | | | | | | | | | | | | | | | | | | t4209: use helper functions to test --grepRené Scharfe2014-03-241-14/+4
| * | | | | | | | | | | | | | | | | | | | | | | t4209: factor out helper function test_log_icase()René Scharfe2014-03-241-12/+14
| * | | | | | | | | | | | | | | | | | | | | | | t4209: factor out helper function test_log()René Scharfe2014-03-241-58/+42
| * | | | | | | | | | | | | | | | | | | | | | | t4209: set up expectations up frontRené Scharfe2014-03-241-39/+25
| | |_|_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Revert part of 384364b (Start preparing for Git 2.0, 2014-03-07)Junio C Hamano2014-04-021-5/+0
* | | | | | | | | | | | | | | | | | | | | | | Revert "submodule: explicit local branch creation in module_clone"Junio C Hamano2014-04-024-109/+26
* | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'wt/doc-submodule-name-path-confusion-2'"Junio C Hamano2014-04-011-1/+1
* | | | | | | | | | | | | | | | | | | | | | | Update draft release notes to 2.0Junio C Hamano2014-03-311-0/+13
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mm/status-porcelain-format-i18n-fix'Junio C Hamano2014-03-312-5/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | status: disable translation when --porcelain is usedmm/status-porcelain-format-i18n-fixMatthieu Moy2014-03-262-5/+9
| | |_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'an/branch-config-message'Junio C Hamano2014-03-311-23/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | branch.c: install_branch_config: simplify if chainan/branch-config-messageAdam2014-03-241-23/+23
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/tests-cleanup'Junio C Hamano2014-03-3110-180/+87
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | t0001: drop subshells just for "cd"jk/tests-cleanupJeff King2014-03-211-47/+9
| * | | | | | | | | | | | | | | | | | | | | | | t0001: drop useless subshellsJeff King2014-03-211-39/+22
| * | | | | | | | | | | | | | | | | | | | | | | t0001: use test_must_failJeff King2014-03-211-27/+11
| * | | | | | | | | | | | | | | | | | | | | | | t0001: use test_config_globalJeff King2014-03-211-7/+4
| * | | | | | | | | | | | | | | | | | | | | | | t0001: use test_path_is_*Jeff King2014-03-211-18/+18
| * | | | | | | | | | | | | | | | | | | | | | | t0001: make symlink reinit test more carefulJeff King2014-03-211-2/+2