Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mr/opt-set-ptr' | Junio C Hamano | 2014-04-08 | 5 | -19/+4 |
|\ | |||||
| * | parse-options: remove unused OPT_SET_PTRmr/opt-set-ptr | Marat Radchenko | 2014-03-31 | 5 | -19/+4 |
| * | parse-options: add cast to correct pointer type to OPT_SET_PTR | Junio C Hamano | 2014-03-31 | 2 | -2/+2 |
| * | MSVC: fix t0040-parse-options crash | Marat Radchenko | 2014-03-31 | 1 | -1/+1 |
* | | Merge branch 'ib/rev-parse-parseopt-argh' | Junio C Hamano | 2014-04-08 | 1 | -1/+1 |
|\ \ | |||||
| * | | rev-parse: fix typo in example on manpageib/rev-parse-parseopt-argh | René Scharfe | 2014-04-01 | 1 | -1/+1 |
* | | | Merge branch 'mr/msvc-link-with-invalidcontinue' | Junio C Hamano | 2014-04-08 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | MSVC: link in invalidcontinue.obj for better POSIX compatibilitymr/msvc-link-with-invalidcontinue | Marat Radchenko | 2014-03-28 | 1 | -1/+1 |
* | | | | Merge branch 'jc/rev-parse-argh-dashed-multi-words' | Junio C Hamano | 2014-04-08 | 17 | -29/+77 |
|\ \ \ \ | |||||
| * | | | | parse-options: make sure argh string does not have SP or _ | Junio C Hamano | 2014-03-24 | 1 | -0/+3 |
| * | | | | update-index: teach --cacheinfo a new syntax "mode,sha1,path" | Junio C Hamano | 2014-03-24 | 3 | -5/+50 |
| * | | | | parse-options: multi-word argh should use dash to separate words | Junio C Hamano | 2014-03-24 | 13 | -24/+24 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'jk/commit-dates-parsing-fix' | Junio C Hamano | 2014-04-08 | 5 | -4/+47 |
|\ \ \ \ | |||||
| * | | | | t4212: loosen far-in-future test for AIXjk/commit-dates-parsing-fix | Jeff King | 2014-04-01 | 1 | -4/+2 |
| * | | | | date: recognize bogus FreeBSD gmtime output | Jeff King | 2014-04-01 | 4 | -0/+45 |
* | | | | | git-p4: explicitly specify that HEAD is a revision | Vlad Dogaru | 2014-04-07 | 1 | -1/+1 |
* | | | | | MSVC: allow using ExtUtils::MakeMaker | Marat Radchenko | 2014-04-04 | 1 | -1/+0 |
* | | | | | Update draft release notes to 2.0 | Junio C Hamano | 2014-04-03 | 1 | -0/+25 |
* | | | | | 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 |