Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | name-rev: change ULONG_MAX to TIME_MAXmg/timestamp-t-fix | Michael J Gruber | 2017-09-06 | 1 | -1/+1 |
* | Merge branch 'jc/name-rev-lw-tag' | Junio C Hamano | 2017-05-30 | 2 | -8/+53 |
|\ | |||||
| * | name-rev: favor describing with tags and use committer date to tiebreakjc/name-rev-lw-tag | Junio C Hamano | 2017-03-29 | 2 | -10/+45 |
| * | name-rev: refactor logic to see if a new candidate is a better name | Junio C Hamano | 2017-03-29 | 1 | -3/+13 |
* | | Third batch for 2.14 | Junio C Hamano | 2017-05-29 | 1 | -0/+93 |
* | | Merge branch 'jk/ignore-broken-tags-when-ignoring-missing-links' | Junio C Hamano | 2017-05-29 | 2 | -2/+27 |
|\ \ | |||||
| * | | revision.c: ignore broken tags with ignore_missing_linksjk/ignore-broken-tags-when-ignoring-missing-links | Jeff King | 2017-05-20 | 2 | -2/+27 |
* | | | Merge branch 'jk/alternate-ref-optim' | Junio C Hamano | 2017-05-29 | 1 | -1/+4 |
|\ \ \ | |||||
| * | | | t5400: avoid concurrent writes into a trace filejk/alternate-ref-optim | Jeff King | 2017-05-18 | 1 | -1/+4 |
* | | | | Merge branch 'bm/interpret-trailers-cut-line-is-eom' | Junio C Hamano | 2017-05-29 | 5 | -13/+32 |
|\ \ \ \ | |||||
| * | | | | interpret-trailers: honor the cut linebm/interpret-trailers-cut-line-is-eom | Brian Malehorn | 2017-05-18 | 5 | -13/+32 |
* | | | | | Merge branch 'tg/stash-push-fixup' | Junio C Hamano | 2017-05-29 | 1 | -1/+4 |
|\ \ \ \ \ | |||||
| * | | | | | completion: add git stash pushtg/stash-push-fixup | Thomas Gummerer | 2017-05-17 | 1 | -1/+4 |
* | | | | | | Merge branch 'pw/rebase-i-regression-fix' | Junio C Hamano | 2017-05-29 | 1 | -1/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | rebase -i: add missing newline to end of messagepw/rebase-i-regression-fix | Phillip Wood | 2017-05-20 | 1 | -1/+1 |
| * | | | | | | rebase -i: silence stash apply | Phillip Wood | 2017-05-20 | 1 | -0/+2 |
| * | | | | | | rebase -i: fix reflog message | Phillip Wood | 2017-05-20 | 1 | -0/+1 |
* | | | | | | | Merge branch 'kn/ref-filter-branch-list' | Junio C Hamano | 2017-05-29 | 1 | -7/+9 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | ref-filter: resolve HEAD when parsing %(HEAD) atom | Jeff King | 2017-05-20 | 1 | -7/+9 |
* | | | | | | | | Merge branch 'km/log-showsignature-doc' | Junio C Hamano | 2017-05-29 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | config.txt: add an entry for log.showSignaturekm/log-showsignature-doc | Kyle Meyer | 2017-05-20 | 1 | -0/+4 |
* | | | | | | | | | Merge branch 'jk/update-links-in-docs' | Junio C Hamano | 2017-05-29 | 3 | -3/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | doc: use https links to Wikipedia to avoid http redirectsjk/update-links-in-docs | Sven Strickroth | 2017-05-15 | 3 | -3/+3 |
* | | | | | | | | | | Merge branch 'ja/do-not-ask-needless-questions' | Junio C Hamano | 2017-05-29 | 6 | -11/+12 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | git-filter-branch: be more direct in an error messageja/do-not-ask-needless-questions | Jean-Noel Avila | 2017-05-12 | 1 | -1/+1 |
| * | | | | | | | | | | read-tree -m: make error message for merging 0 trees less smart aleck | Jean-Noel Avila | 2017-05-12 | 2 | -3/+4 |
| * | | | | | | | | | | usability: don't ask questions if no reply is required | Jean-Noel Avila | 2017-05-12 | 3 | -7/+7 |
* | | | | | | | | | | | Merge branch 'jk/doc-config-include' | Junio C Hamano | 2017-05-29 | 1 | -10/+21 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | docs/config: consistify include.path examplesjk/doc-config-include | Jeff King | 2017-05-12 | 1 | -2/+2 |
| * | | | | | | | | | | | docs/config: avoid the term "expand" for includes | Jeff King | 2017-05-12 | 1 | -4/+4 |
| * | | | | | | | | | | | docs/config: give a relative includeIf example | Jeff King | 2017-05-12 | 1 | -0/+6 |
| * | | | | | | | | | | | docs/config: clarify include/includeIf relationship | Jeff King | 2017-05-12 | 1 | -6/+11 |
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'sg/core-filemode-doc-typofix' | Junio C Hamano | 2017-05-29 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | docs/config.txt: fix indefinite article in core.fileMode descriptionsg/core-filemode-doc-typofix | SZEDER Gábor | 2017-05-26 | 1 | -1/+1 |
* | | | | | | | | | | | | Merge branch 'jk/bug-to-abort' | Junio C Hamano | 2017-05-29 | 5 | -1/+51 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | usage: add NORETURN to BUG() function definitionsjk/bug-to-abort | Ramsay Jones | 2017-05-22 | 1 | -2/+2 |
| * | | | | | | | | | | | | config: complain about --local outside of a git repo | Jeff King | 2017-05-15 | 2 | -1/+4 |
| * | | | | | | | | | | | | setup_git_env: convert die("BUG") to BUG() | Jeff King | 2017-05-15 | 2 | -1/+7 |
| * | | | | | | | | | | | | usage.c: add BUG() function | Jeff King | 2017-05-15 | 2 | -0/+41 |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'js/eol-on-ourselves' | Junio C Hamano | 2017-05-29 | 11 | -26/+55 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | t4051: mark supporting files as requiring LF-only line endingsjs/eol-on-ourselves | Johannes Schindelin | 2017-05-10 | 1 | -0/+1 |
| * | | | | | | | | | | | | Fix the remaining tests that failed with core.autocrlf=true | Johannes Schindelin | 2017-05-10 | 1 | -1/+20 |
| * | | | | | | | | | | | | t3901: move supporting files into t/t3901/ | Johannes Schindelin | 2017-05-10 | 6 | -24/+24 |
| * | | | | | | | | | | | | completion: mark bash script as LF-only | Johannes Schindelin | 2017-05-10 | 1 | -0/+1 |
| * | | | | | | | | | | | | git-new-workdir: mark script as LF-only | Johannes Schindelin | 2017-05-10 | 1 | -0/+1 |
| * | | | | | | | | | | | | Fix build with core.autocrlf=true | Johannes Schindelin | 2017-05-10 | 2 | -1/+8 |
* | | | | | | | | | | | | | Merge branch 'jc/read-tree-empty-with-m' | Junio C Hamano | 2017-05-29 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | read-tree: "read-tree -m --empty" does not make sensejc/read-tree-empty-with-m | Junio C Hamano | 2017-05-10 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'js/plug-leaks' | Junio C Hamano | 2017-05-29 | 23 | -64/+149 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | checkout: fix memory leakjs/plug-leaks | Junio C Hamano | 2017-05-09 | 1 | -0/+1 |