Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2014-04-03 | 1 | -0/+38 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | Start preparing for 1.9.1 | Junio C Hamano | 2014-04-03 | 2 | -1/+39 | |
| * | | | | | | | | | | | Merge branch 'jk/mv-submodules-fix' into maint | Junio C Hamano | 2014-04-03 | 2 | -1/+21 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/remove-subtree-long-pathname-fix' into maint | Junio C Hamano | 2014-04-03 | 1 | -32/+32 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/lib-terminal-lazy' into maint | Junio C Hamano | 2014-04-03 | 1 | -18/+19 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/index-pack-error-message' into maint | Junio C Hamano | 2014-04-03 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'us/printf-not-echo' into maint | Junio C Hamano | 2014-04-03 | 2 | -3/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rr/doc-merge-strategies' into maint | Junio C Hamano | 2014-04-03 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/shallow-update-fix' into maint | Junio C Hamano | 2014-04-03 | 5 | -56/+49 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/stash-pop-not-popped' into maint | Junio C Hamano | 2014-04-03 | 1 | -2/+8 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/wt-status' into maint | Junio C Hamano | 2014-04-03 | 3 | -55/+88 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/gc-aggressive' | Junio C Hamano | 2014-04-03 | 5 | -3/+17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | environment.c: fix constness for odb_pack_keep()nd/gc-aggressive | Nguyễn Thái Ngọc Duy | 2014-03-31 | 2 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | | gc --aggressive: make --depth configurable | Nguyễn Thái Ngọc Duy | 2014-03-31 | 3 | -1/+15 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/fix-diff-no-index-diff-opt-parse' | Junio C Hamano | 2014-04-03 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | diff-no-index: correctly diagnose error return from diff_opt_parse()jc/fix-diff-no-index-diff-opt-parse | Junio C Hamano | 2014-03-31 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'cb/aix' | Junio C Hamano | 2014-04-03 | 3 | -7/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | tests: don't rely on strerror text when testing rmdir failurecb/aix | Charles Bailey | 2014-03-31 | 2 | -4/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | dir.c: make git_fnmatch() not inline | Charles Bailey | 2014-03-31 | 1 | -3/+3 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'cn/fetch-prune-overlapping-destination' | Junio C Hamano | 2014-04-03 | 2 | -6/+64 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | fetch: handle overlaping refspecs on --prunecn/fetch-prune-overlapping-destination | Carlos Martín Nieto | 2014-03-26 | 2 | -7/+45 | |
| * | | | | | | | | | | | | | | | | | | | | fetch: add a failing test for prunning with overlapping refspecs | Carlos Martín Nieto | 2014-02-28 | 1 | -0/+20 | |
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/log-show-linear-break' | Junio C Hamano | 2014-04-03 | 14 | -11/+89 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | log: add --show-linear-break to help see non-linear historynd/log-show-linear-break | Nguyễn Thái Ngọc Duy | 2014-03-25 | 5 | -5/+66 | |
| * | | | | | | | | | | | | | | | | | | | | object.h: centralize object flag allocation | Nguyễn Thái Ngọc Duy | 2014-03-25 | 11 | -7/+24 | |
* | | | | | | | | | | | | | | | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |