summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* name-rev: change ULONG_MAX to TIME_MAXmg/timestamp-t-fixMichael J Gruber2017-09-061-1/+1
* Merge branch 'jc/name-rev-lw-tag'Junio C Hamano2017-05-302-8/+53
|\
| * name-rev: favor describing with tags and use committer date to tiebreakjc/name-rev-lw-tagJunio C Hamano2017-03-292-10/+45
| * name-rev: refactor logic to see if a new candidate is a better nameJunio C Hamano2017-03-291-3/+13
* | Third batch for 2.14Junio C Hamano2017-05-291-0/+93
* | Merge branch 'jk/ignore-broken-tags-when-ignoring-missing-links'Junio C Hamano2017-05-292-2/+27
|\ \
| * | revision.c: ignore broken tags with ignore_missing_linksjk/ignore-broken-tags-when-ignoring-missing-linksJeff King2017-05-202-2/+27
* | | Merge branch 'jk/alternate-ref-optim'Junio C Hamano2017-05-291-1/+4
|\ \ \
| * | | t5400: avoid concurrent writes into a trace filejk/alternate-ref-optimJeff King2017-05-181-1/+4
* | | | Merge branch 'bm/interpret-trailers-cut-line-is-eom'Junio C Hamano2017-05-295-13/+32
|\ \ \ \
| * | | | interpret-trailers: honor the cut linebm/interpret-trailers-cut-line-is-eomBrian Malehorn2017-05-185-13/+32
* | | | | Merge branch 'tg/stash-push-fixup'Junio C Hamano2017-05-291-1/+4
|\ \ \ \ \
| * | | | | completion: add git stash pushtg/stash-push-fixupThomas Gummerer2017-05-171-1/+4
* | | | | | Merge branch 'pw/rebase-i-regression-fix'Junio C Hamano2017-05-291-1/+4
|\ \ \ \ \ \
| * | | | | | rebase -i: add missing newline to end of messagepw/rebase-i-regression-fixPhillip Wood2017-05-201-1/+1
| * | | | | | rebase -i: silence stash applyPhillip Wood2017-05-201-0/+2
| * | | | | | rebase -i: fix reflog messagePhillip Wood2017-05-201-0/+1
* | | | | | | Merge branch 'kn/ref-filter-branch-list'Junio C Hamano2017-05-291-7/+9
|\ \ \ \ \ \ \
| * | | | | | | ref-filter: resolve HEAD when parsing %(HEAD) atomJeff King2017-05-201-7/+9
* | | | | | | | Merge branch 'km/log-showsignature-doc'Junio C Hamano2017-05-291-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | config.txt: add an entry for log.showSignaturekm/log-showsignature-docKyle Meyer2017-05-201-0/+4
* | | | | | | | | Merge branch 'jk/update-links-in-docs'Junio C Hamano2017-05-293-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | doc: use https links to Wikipedia to avoid http redirectsjk/update-links-in-docsSven Strickroth2017-05-153-3/+3
* | | | | | | | | | Merge branch 'ja/do-not-ask-needless-questions'Junio C Hamano2017-05-296-11/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-filter-branch: be more direct in an error messageja/do-not-ask-needless-questionsJean-Noel Avila2017-05-121-1/+1
| * | | | | | | | | | read-tree -m: make error message for merging 0 trees less smart aleckJean-Noel Avila2017-05-122-3/+4
| * | | | | | | | | | usability: don't ask questions if no reply is requiredJean-Noel Avila2017-05-123-7/+7
* | | | | | | | | | | Merge branch 'jk/doc-config-include'Junio C Hamano2017-05-291-10/+21
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | docs/config: consistify include.path examplesjk/doc-config-includeJeff King2017-05-121-2/+2
| * | | | | | | | | | | docs/config: avoid the term "expand" for includesJeff King2017-05-121-4/+4
| * | | | | | | | | | | docs/config: give a relative includeIf exampleJeff King2017-05-121-0/+6
| * | | | | | | | | | | docs/config: clarify include/includeIf relationshipJeff King2017-05-121-6/+11
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'sg/core-filemode-doc-typofix'Junio C Hamano2017-05-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | docs/config.txt: fix indefinite article in core.fileMode descriptionsg/core-filemode-doc-typofixSZEDER Gábor2017-05-261-1/+1
* | | | | | | | | | | | Merge branch 'jk/bug-to-abort'Junio C Hamano2017-05-295-1/+51
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | usage: add NORETURN to BUG() function definitionsjk/bug-to-abortRamsay Jones2017-05-221-2/+2
| * | | | | | | | | | | | config: complain about --local outside of a git repoJeff King2017-05-152-1/+4
| * | | | | | | | | | | | setup_git_env: convert die("BUG") to BUG()Jeff King2017-05-152-1/+7
| * | | | | | | | | | | | usage.c: add BUG() functionJeff King2017-05-152-0/+41
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'js/eol-on-ourselves'Junio C Hamano2017-05-2911-26/+55
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t4051: mark supporting files as requiring LF-only line endingsjs/eol-on-ourselvesJohannes Schindelin2017-05-101-0/+1
| * | | | | | | | | | | | Fix the remaining tests that failed with core.autocrlf=trueJohannes Schindelin2017-05-101-1/+20
| * | | | | | | | | | | | t3901: move supporting files into t/t3901/Johannes Schindelin2017-05-106-24/+24
| * | | | | | | | | | | | completion: mark bash script as LF-onlyJohannes Schindelin2017-05-101-0/+1
| * | | | | | | | | | | | git-new-workdir: mark script as LF-onlyJohannes Schindelin2017-05-101-0/+1
| * | | | | | | | | | | | Fix build with core.autocrlf=trueJohannes Schindelin2017-05-102-1/+8
* | | | | | | | | | | | | Merge branch 'jc/read-tree-empty-with-m'Junio C Hamano2017-05-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | read-tree: "read-tree -m --empty" does not make sensejc/read-tree-empty-with-mJunio C Hamano2017-05-101-1/+1
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'js/plug-leaks'Junio C Hamano2017-05-2923-64/+149
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | checkout: fix memory leakjs/plug-leaksJunio C Hamano2017-05-091-0/+1