Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | Merge branch 'svn-crlf' of git://bogomips.org/git-svn into ew/svn-crlfew/svn-crlf | Junio C Hamano | 2017-12-14 | 2 | -0/+28 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | git-svn: convert CRLF to LF in commit message to SVN | Eric Wong | 2017-12-14 | 2 | -0/+28 | |
| | | |_|_|/ / / / | | |/| | | | | | | ||||||
* | | | | | | | | | Merge branch 'cc/skip-to-optional-val' | Junio C Hamano | 2017-12-28 | 5 | -90/+126 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | t4045: reindent to make helpers readablecc/skip-to-optional-val | Junio C Hamano | 2017-12-11 | 1 | -48/+56 | |
| * | | | | | | | | | diff: add tests for --relative without optional prefix value | Jacob Keller | 2017-12-11 | 1 | -8/+14 | |
| * | | | | | | | | | diff: use skip_to_optional_arg_default() in parsing --relative | Junio C Hamano | 2017-12-11 | 1 | -4/+3 | |
| * | | | | | | | | | diff: use skip_to_optional_arg_default() | Christian Couder | 2017-12-11 | 1 | -16/+4 | |
| * | | | | | | | | | diff: use skip_to_optional_arg() | Christian Couder | 2017-12-11 | 1 | -14/+9 | |
| * | | | | | | | | | index-pack: use skip_to_optional_arg() | Christian Couder | 2017-12-11 | 1 | -8/+3 | |
| * | | | | | | | | | git-compat-util: introduce skip_to_optional_arg() | Christian Couder | 2017-12-11 | 2 | -0/+45 | |
* | | | | | | | | | | Merge branch 'ra/prompt-eread-fix' | Junio C Hamano | 2017-12-28 | 1 | -3/+4 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | git-prompt: fix reading files with windows line endingsra/prompt-eread-fix | Robert Abel | 2017-12-06 | 1 | -1/+1 | |
| * | | | | | | | | | | git-prompt: make __git_eread intended use explicit | Robert Abel | 2017-12-06 | 1 | -3/+4 | |
* | | | | | | | | | | | Merge branch 'bw/path-doc' | Junio C Hamano | 2017-12-28 | 1 | -21/+112 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | path: document path functionsbw/path-doc | Brandon Williams | 2017-12-13 | 1 | -21/+112 | |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | RelNotes: the eleventh batch | Junio C Hamano | 2017-12-27 | 1 | -0/+41 | |
* | | | | | | | | | | | Merge branch 'rb/quick-install-doc' | Junio C Hamano | 2017-12-27 | 2 | -6/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | install-doc-quick: allow specifying what ref to installrb/quick-install-doc | Randall S. Becker | 2017-12-12 | 2 | -6/+8 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'jt/transport-no-more-rsync' | Junio C Hamano | 2017-12-27 | 2 | -9/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | transport: remove unused "push" in vtablejt/transport-no-more-rsync | Jonathan Tan | 2017-12-12 | 2 | -9/+1 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge branch 'sg/travis-fixes' | Junio C Hamano | 2017-12-27 | 3 | -29/+39 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | travis-ci: use 'set -x' in 'ci/*' scripts for extra tracing output | SZEDER Gábor | 2017-12-12 | 1 | -1/+1 | |
| * | | | | | | | | | | travis-ci: set GIT_TEST_HTTPD in 'ci/lib-travisci.sh' | SZEDER Gábor | 2017-12-12 | 2 | -2/+2 | |
| * | | | | | | | | | | travis-ci: move setting environment variables to 'ci/lib-travisci.sh' | SZEDER Gábor | 2017-12-12 | 2 | -17/+22 | |
| * | | | | | | | | | | travis-ci: introduce a $jobname variable for 'ci/*' scripts | SZEDER Gábor | 2017-12-12 | 3 | -10/+15 | |
* | | | | | | | | | | | Merge branch 'sb/test-helper-excludes' | Junio C Hamano | 2017-12-27 | 1 | -41/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | t/helper: ignore everything but sourcessb/test-helper-excludes | Stefan Beller | 2017-12-12 | 1 | -38/+4 | |
| | |/ / / / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'ot/pretty' | Junio C Hamano | 2017-12-27 | 6 | -84/+136 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | format: create docs for pretty.hot/pretty | Olga Telezhnaya | 2017-12-12 | 1 | -0/+44 | |
| * | | | | | | | | | | | format: create pretty.h file | Olga Telezhnaya | 2017-12-12 | 6 | -84/+92 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'bw/submodule-sans-cache-compat' | Junio C Hamano | 2017-12-27 | 5 | -23/+31 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | submodule: convert get_next_submodule to not rely on the_indexbw/submodule-sans-cache-compat | Brandon Williams | 2017-12-12 | 3 | -15/+22 | |
| * | | | | | | | | | | | submodule: used correct index in is_staging_gitmodules_ok | Brandon Williams | 2017-12-12 | 2 | -3/+4 | |
| * | | | | | | | | | | | submodule: convert stage_updated_gitmodules to take a struct index_state | Brandon Williams | 2017-12-12 | 4 | -5/+5 | |
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'es/clone-shared-worktree' | Junio C Hamano | 2017-12-27 | 2 | -1/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | clone: support 'clone --shared' from a worktreees/clone-shared-worktree | Eric Sunshine | 2017-12-11 | 2 | -1/+8 | |
* | | | | | | | | | | | | Merge branch 'tb/delimit-pretty-trailers-args-with-comma' | Junio C Hamano | 2017-12-27 | 1 | -5/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | docs/pretty-formats: mention commas in %(trailers) syntaxtb/delimit-pretty-trailers-args-with-comma | Jeff King | 2017-12-08 | 1 | -5/+7 | |
* | | | | | | | | | | | | | Merge branch 'rs/fmt-merge-msg-leakfix' | Junio C Hamano | 2017-12-27 | 1 | -2/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | transport-helper: plug strbuf and string_list leaksrs/fmt-merge-msg-leakfix | René Scharfe | 2017-12-08 | 1 | -2/+5 | |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'jt/decorate-api' | Junio C Hamano | 2017-12-27 | 8 | -25/+146 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | decorate: clean up and document APIjt/decorate-api | Jonathan Tan | 2017-12-08 | 8 | -25/+146 | |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'jk/cvsimport-quoting' | Junio C Hamano | 2017-12-27 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | cvsimport: apply shell-quoting regex globallyjk/cvsimport-quoting | Jeff King | 2017-12-08 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | Merge branch 'db/doc-workflows-neuter-the-maintainer' | Junio C Hamano | 2017-12-27 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | doc: reword gitworkflows.txt for neutralitydb/doc-workflows-neuter-the-maintainer | Daniel Bensoussan | 2017-12-08 | 1 | -2/+2 | |
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'ks/branch-cleanup' | Junio C Hamano | 2017-12-27 | 4 | -11/+24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | builtin/branch: strip refs/heads/ using skip_prefixks/branch-cleanup | Kaartic Sivaraam | 2017-12-07 | 1 | -4/+11 | |
| * | | | | | | | | | | | | | | branch: update warning message shown when copying a misnamed branch | Kaartic Sivaraam | 2017-12-07 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | branch: group related arguments of create_branch() | Kaartic Sivaraam | 2017-12-07 | 4 | -7/+8 |