Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | check_bindir: avoid "test <cond> -a/-o <cond>" | Elia Pinto | 2014-06-09 | 1 | -1/+1 |
* | Second batch for 2.1 | Junio C Hamano | 2014-06-06 | 1 | -0/+87 |
* | Merge branch 'ss/howto-manage-trunk' | Junio C Hamano | 2014-06-06 | 2 | -0/+217 |
|\ | |||||
| * | How to keep a project's canonical history correct. | Stephen P. Smith | 2014-05-28 | 2 | -0/+217 |
* | | Merge branch 'mc/git-p4-prepare-p4-only' | Junio C Hamano | 2014-06-06 | 2 | -24/+28 |
|\ \ | |||||
| * | | git-p4: Do not include diff in spec file when just preparing p4 | Maxime Coste | 2014-05-27 | 2 | -24/+28 |
* | | | Merge branch 'jn/test-lint-unmoor' | Junio C Hamano | 2014-06-06 | 1 | -4/+4 |
|\ \ \ | |||||
| * | | | test-lint: find unportable sed, echo, test, and export usage after && | Jonathan Nieder | 2014-05-23 | 1 | -4/+4 |
* | | | | Merge branch 'ep/shell-assign-and-export-vars' | Junio C Hamano | 2014-06-06 | 5 | -5/+16 |
|\ \ \ \ | |||||
| * | | | | scripts: more "export VAR=VALUE" fixes | Junio C Hamano | 2014-05-24 | 2 | -2/+10 |
| * | | | | scripts: "export VAR=VALUE" construct is not portable | Elia Pinto | 2014-05-24 | 3 | -3/+6 |
| |/ / / | |||||
* | | | | Merge branch 'jj/command-line-adjective' | Junio C Hamano | 2014-06-06 | 19 | -47/+47 |
|\ \ \ \ | |||||
| * | | | | Documentation: use "command-line" when used as a compound adjective, and fix ... | Jason St. John | 2014-05-21 | 19 | -47/+47 |
* | | | | | Merge branch 'jc/coding-guidelines' | Junio C Hamano | 2014-06-06 | 1 | -5/+145 |
|\ \ \ \ \ | |||||
| * | | | | | CodingGuidelines: avoid "test <cond> -a/-o <cond>" | Junio C Hamano | 2014-05-20 | 1 | -0/+13 |
| * | | | | | CodingGuidelines: on splitting a long line | Junio C Hamano | 2014-05-02 | 1 | -0/+55 |
| * | | | | | CodingGuidelines: on comparison | Junio C Hamano | 2014-05-02 | 1 | -0/+27 |
| * | | | | | CodingGuidelines: do not call the conditional statement "if()" | Junio C Hamano | 2014-05-02 | 1 | -1/+1 |
| * | | | | | CodingGuidelines: give an example for shell function preamble | Junio C Hamano | 2014-05-02 | 1 | -3/+11 |
| * | | | | | CodingGuidelines: give an example for control statements | Junio C Hamano | 2014-05-02 | 1 | -0/+11 |
| * | | | | | CodingGuidelines: give an example for redirection | Junio C Hamano | 2014-05-02 | 1 | -0/+8 |
| * | | | | | CodingGuidelines: give an example for case/esac statement | Junio C Hamano | 2014-05-02 | 1 | -1/+11 |
| * | | | | | CodingGuidelines: once it is in, it is not worth the code churn | Junio C Hamano | 2014-05-02 | 1 | -0/+8 |
* | | | | | | Merge branch 'nd/status-auto-comment-char' | Junio C Hamano | 2014-06-06 | 7 | -4/+73 |
|\ \ \ \ \ \ | |||||
| * | | | | | | commit: allow core.commentChar=auto for character auto selection | Nguyễn Thái Ngọc Duy | 2014-05-19 | 6 | -0/+66 |
| * | | | | | | config: be strict on core.commentChar | Nguyễn Thái Ngọc Duy | 2014-05-19 | 2 | -4/+7 |
* | | | | | | | Merge branch 'mt/rebase-i-keep-empty-test' | Junio C Hamano | 2014-06-06 | 1 | -0/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | rebase --keep-empty -i: add test | Michael S. Tsirkin | 2014-05-19 | 1 | -0/+8 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'mk/show-s-no-extra-blank-line-for-merges' | Junio C Hamano | 2014-06-06 | 4 | -11/+15 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git-show: fix 'git show -s' to not add extra terminator after merge commit | Max Kirillov | 2014-05-15 | 4 | -11/+15 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'sk/spawn-less-case-insensitively-from-grep-O-i' | Junio C Hamano | 2014-06-06 | 1 | -0/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git grep -O -i: if the pager is 'less', pass the '-I' option | Johannes Schindelin | 2014-05-15 | 1 | -0/+3 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'jd/subtree' | Junio C Hamano | 2014-06-06 | 2 | -16/+25 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | contrib/subtree: allow adding an annotated tag | James Denholm | 2014-05-13 | 1 | -1/+2 |
| * | | | | | | | contrib/subtree/Makefile: clean up rule for "clean" | James Denholm | 2014-05-07 | 1 | -3/+4 |
| * | | | | | | | contrib/subtree/Makefile: clean up rules to generate documentation | James Denholm | 2014-05-07 | 1 | -5/+8 |
| * | | | | | | | contrib/subtree/Makefile: s/libexecdir/gitexecdir/ | James Denholm | 2014-05-07 | 1 | -3/+3 |
| * | | | | | | | contrib/subtree/Makefile: use GIT-VERSION-FILE | James Denholm | 2014-05-07 | 1 | -3/+8 |
| * | | | | | | | contrib/subtree/Makefile: scrap unused $(gitdir) | James Denholm | 2014-05-06 | 1 | -1/+0 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'wk/doc-clarify-upstream' | Junio C Hamano | 2014-06-06 | 1 | -1/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Documentation: mention config sources for @{upstream} | W. Trevor King | 2014-05-13 | 1 | -1/+3 |
* | | | | | | | | Merge branch 'tb/unicode-6.3-zero-width' | Junio C Hamano | 2014-06-06 | 5 | -69/+334 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | utf8: make it easier to auto-update git_wcwidth() | Torsten Bögershausen | 2014-05-12 | 5 | -59/+329 |
| * | | | | | | | | utf8.c: use a table for double_width | Torsten Bögershausen | 2014-05-12 | 1 | -23/+18 |
* | | | | | | | | | Merge branch 'jk/index-pack-report-missing' | Junio C Hamano | 2014-06-06 | 1 | -2/+7 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | index-pack: distinguish missing objects from type errors | Jeff King | 2014-05-12 | 1 | -2/+7 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'bc/blame-crlf-test' | Junio C Hamano | 2014-06-06 | 2 | -1/+9 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | blame: correctly handle files regardless of autocrlf | brian m. carlson | 2014-05-08 | 2 | -1/+9 |
* | | | | | | | | | | Merge branch 'sk/submodules-absolute-path-on-windows' | Junio C Hamano | 2014-06-06 | 1 | -3/+0 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Revert "submodules: fix ambiguous absolute paths under Windows" | Stepan Kasal | 2014-05-08 | 1 | -3/+0 |
| | |_|_|_|/ / / / / | |/| | | | | | | | |