Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'ep/shell-command-substitution' | Junio C Hamano | 2014-04-03 | 2 | -17/+17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | git-am.sh: use the $(...) construct for command substitution | Elia Pinto | 2014-03-25 | 1 | -15/+15 | |
| * | | | | | | | | | | | | | | | | | check-builtins.sh: use the $(...) construct for command substitution | Elia Pinto | 2014-03-25 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'ap/remote-hg-skip-null-bookmarks' | Junio C Hamano | 2014-04-02 | 2 | -1/+77 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | remote-hg: do not fail on invalid bookmarksap/remote-hg-skip-null-bookmarks | Max Horn | 2014-03-25 | 2 | -1/+77 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'rs/pickaxe-i' | Junio C Hamano | 2014-04-02 | 2 | -188/+116 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | pickaxe: simplify kwset loop in contains()rs/pickaxe-i | René Scharfe | 2014-03-24 | 1 | -5/+2 | |
| * | | | | | | | | | | | | | | | | | | | pickaxe: call strlen only when necessary in diffcore_pickaxe_count() | René Scharfe | 2014-03-24 | 1 | -2/+1 | |
| * | | | | | | | | | | | | | | | | | | | pickaxe: move pickaxe() after pickaxe_match() | René Scharfe | 2014-03-24 | 1 | -41/+38 | |
| * | | | | | | | | | | | | | | | | | | | pickaxe: merge diffcore_pickaxe_grep() and diffcore_pickaxe_count() into diff... | René Scharfe | 2014-03-24 | 1 | -37/+7 | |
| * | | | | | | | | | | | | | | | | | | | pickaxe: honor -i when used with -S and --pickaxe-regex | René Scharfe | 2014-03-24 | 2 | -1/+9 | |
| * | | | | | | | | | | | | | | | | | | | t4209: use helper functions to test --author | René Scharfe | 2014-03-24 | 1 | -9/+4 | |
| * | | | | | | | | | | | | | | | | | | | t4209: use helper functions to test --grep | René Scharfe | 2014-03-24 | 1 | -14/+4 | |
| * | | | | | | | | | | | | | | | | | | | t4209: factor out helper function test_log_icase() | René Scharfe | 2014-03-24 | 1 | -12/+14 | |
| * | | | | | | | | | | | | | | | | | | | t4209: factor out helper function test_log() | René Scharfe | 2014-03-24 | 1 | -58/+42 | |
| * | | | | | | | | | | | | | | | | | | | t4209: set up expectations up front | René Scharfe | 2014-03-24 | 1 | -39/+25 | |
| | |_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Revert part of 384364b (Start preparing for Git 2.0, 2014-03-07) | Junio C Hamano | 2014-04-02 | 1 | -5/+0 | |
* | | | | | | | | | | | | | | | | | | | Revert "submodule: explicit local branch creation in module_clone" | Junio C Hamano | 2014-04-02 | 4 | -109/+26 | |
* | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'wt/doc-submodule-name-path-confusion-2'" | Junio C Hamano | 2014-04-01 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | Update draft release notes to 2.0 | Junio C Hamano | 2014-03-31 | 1 | -0/+13 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'mm/status-porcelain-format-i18n-fix' | Junio C Hamano | 2014-03-31 | 2 | -5/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | status: disable translation when --porcelain is usedmm/status-porcelain-format-i18n-fix | Matthieu Moy | 2014-03-26 | 2 | -5/+9 | |
| | |_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'an/branch-config-message' | Junio C Hamano | 2014-03-31 | 1 | -23/+23 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | branch.c: install_branch_config: simplify if chainan/branch-config-message | Adam | 2014-03-24 | 1 | -23/+23 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/tests-cleanup' | Junio C Hamano | 2014-03-31 | 10 | -180/+87 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | t0001: drop subshells just for "cd"jk/tests-cleanup | Jeff King | 2014-03-21 | 1 | -47/+9 | |
| * | | | | | | | | | | | | | | | | | | | | t0001: drop useless subshells | Jeff King | 2014-03-21 | 1 | -39/+22 | |
| * | | | | | | | | | | | | | | | | | | | | t0001: use test_must_fail | Jeff King | 2014-03-21 | 1 | -27/+11 | |
| * | | | | | | | | | | | | | | | | | | | | t0001: use test_config_global | Jeff King | 2014-03-21 | 1 | -7/+4 | |
| * | | | | | | | | | | | | | | | | | | | | t0001: use test_path_is_* | Jeff King | 2014-03-21 | 1 | -18/+18 | |
| * | | | | | | | | | | | | | | | | | | | | t0001: make symlink reinit test more careful | Jeff King | 2014-03-21 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | | t: prefer "git config --file" to GIT_CONFIG | Jeff King | 2014-03-21 | 5 | -18/+17 | |
| * | | | | | | | | | | | | | | | | | | | | t: prefer "git config --file" to GIT_CONFIG with test_must_fail | Jeff King | 2014-03-21 | 1 | -4/+4 | |
| * | | | | | | | | | | | | | | | | | | | | t: stop using GIT_CONFIG to cross repo boundaries | Jeff King | 2014-03-21 | 2 | -5/+5 | |
| * | | | | | | | | | | | | | | | | | | | | t: drop useless sane_unset GIT_* calls | Jeff King | 2014-03-21 | 3 | -17/+0 | |
| * | | | | | | | | | | | | | | | | | | | | t/test-lib: drop redundant unset of GIT_CONFIG | Jeff King | 2014-03-21 | 1 | -1/+0 | |
| * | | | | | | | | | | | | | | | | | | | | t/Makefile: stop setting GIT_CONFIG | Jeff King | 2014-03-21 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'wt/doc-submodule-name-path-confusion-2' | Junio C Hamano | 2014-03-31 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | doc: submodule.*.branch config is keyed by namewt/doc-submodule-name-path-confusion-2 | W. Trevor King | 2014-03-27 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'wt/doc-submodule-name-path-confusion-1' | Junio C Hamano | 2014-03-31 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | doc: submodule.* config are keyed by submodule nameswt/doc-submodule-name-path-confusion-1 | W. Trevor King | 2014-03-27 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mr/msvc-link-with-lcurl' | Junio C Hamano | 2014-03-31 | 2 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | MSVC: allow linking with the cURL librarymr/msvc-link-with-lcurl | Marat Radchenko | 2014-03-27 | 2 | -1/+2 | |
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ib/rev-parse-parseopt-argh' | Junio C Hamano | 2014-03-31 | 3 | -39/+100 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | t1502: protect runs of SPs used in the indentation | Junio C Hamano | 2014-03-23 | 1 | -56/+56 | |
| * | | | | | | | | | | | | | | | | | | | | | | rev-parse --parseopt: option argument name hints | Ilya Bobyr | 2014-03-23 | 3 | -3/+64 | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dp/makefile-charset-lib-doc' | Junio C Hamano | 2014-03-31 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | Makefile: describe CHARSET_LIB betterdp/makefile-charset-lib-doc | Дилян Палаузов | 2014-03-23 | 1 | -2/+2 | |
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/userdiff-cc' | Junio C Hamano | 2014-03-31 | 33 | -160/+303 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | userdiff: have 'cpp' hunk header pattern catch more C++ anchor pointsjs/userdiff-cc | Johannes Sixt | 2014-03-21 | 13 | -17/+3 |