summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | Merge branch 'svn-crlf' of git://bogomips.org/git-svn into ew/svn-crlfew/svn-crlfJunio C Hamano2017-12-142-0/+28
| |\ \ \ \ \ \ \ \
| | * | | | | | | | git-svn: convert CRLF to LF in commit message to SVNEric Wong2017-12-142-0/+28
| | | |_|_|/ / / / | | |/| | | | | |
* | | | | | | | | Merge branch 'cc/skip-to-optional-val'Junio C Hamano2017-12-285-90/+126
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t4045: reindent to make helpers readablecc/skip-to-optional-valJunio C Hamano2017-12-111-48/+56
| * | | | | | | | | diff: add tests for --relative without optional prefix valueJacob Keller2017-12-111-8/+14
| * | | | | | | | | diff: use skip_to_optional_arg_default() in parsing --relativeJunio C Hamano2017-12-111-4/+3
| * | | | | | | | | diff: use skip_to_optional_arg_default()Christian Couder2017-12-111-16/+4
| * | | | | | | | | diff: use skip_to_optional_arg()Christian Couder2017-12-111-14/+9
| * | | | | | | | | index-pack: use skip_to_optional_arg()Christian Couder2017-12-111-8/+3
| * | | | | | | | | git-compat-util: introduce skip_to_optional_arg()Christian Couder2017-12-112-0/+45
* | | | | | | | | | Merge branch 'ra/prompt-eread-fix'Junio C Hamano2017-12-281-3/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-prompt: fix reading files with windows line endingsra/prompt-eread-fixRobert Abel2017-12-061-1/+1
| * | | | | | | | | | git-prompt: make __git_eread intended use explicitRobert Abel2017-12-061-3/+4
* | | | | | | | | | | Merge branch 'bw/path-doc'Junio C Hamano2017-12-281-21/+112
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | path: document path functionsbw/path-docBrandon Williams2017-12-131-21/+112
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | RelNotes: the eleventh batchJunio C Hamano2017-12-271-0/+41
* | | | | | | | | | | Merge branch 'rb/quick-install-doc'Junio C Hamano2017-12-272-6/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | install-doc-quick: allow specifying what ref to installrb/quick-install-docRandall S. Becker2017-12-122-6/+8
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jt/transport-no-more-rsync'Junio C Hamano2017-12-272-9/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| * | | | | | | | | | transport: remove unused "push" in vtablejt/transport-no-more-rsyncJonathan Tan2017-12-122-9/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'sg/travis-fixes'Junio C Hamano2017-12-273-29/+39
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | travis-ci: use 'set -x' in 'ci/*' scripts for extra tracing outputSZEDER Gábor2017-12-121-1/+1
| * | | | | | | | | | travis-ci: set GIT_TEST_HTTPD in 'ci/lib-travisci.sh'SZEDER Gábor2017-12-122-2/+2
| * | | | | | | | | | travis-ci: move setting environment variables to 'ci/lib-travisci.sh'SZEDER Gábor2017-12-122-17/+22
| * | | | | | | | | | travis-ci: introduce a $jobname variable for 'ci/*' scriptsSZEDER Gábor2017-12-123-10/+15
* | | | | | | | | | | Merge branch 'sb/test-helper-excludes'Junio C Hamano2017-12-271-41/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t/helper: ignore everything but sourcessb/test-helper-excludesStefan Beller2017-12-121-38/+4
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ot/pretty'Junio C Hamano2017-12-276-84/+136
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | format: create docs for pretty.hot/prettyOlga Telezhnaya2017-12-121-0/+44
| * | | | | | | | | | | format: create pretty.h fileOlga Telezhnaya2017-12-126-84/+92
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'bw/submodule-sans-cache-compat'Junio C Hamano2017-12-275-23/+31
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | submodule: convert get_next_submodule to not rely on the_indexbw/submodule-sans-cache-compatBrandon Williams2017-12-123-15/+22
| * | | | | | | | | | | submodule: used correct index in is_staging_gitmodules_okBrandon Williams2017-12-122-3/+4
| * | | | | | | | | | | submodule: convert stage_updated_gitmodules to take a struct index_stateBrandon Williams2017-12-124-5/+5
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'es/clone-shared-worktree'Junio C Hamano2017-12-272-1/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | clone: support 'clone --shared' from a worktreees/clone-shared-worktreeEric Sunshine2017-12-112-1/+8
* | | | | | | | | | | | Merge branch 'tb/delimit-pretty-trailers-args-with-comma'Junio C Hamano2017-12-271-5/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | docs/pretty-formats: mention commas in %(trailers) syntaxtb/delimit-pretty-trailers-args-with-commaJeff King2017-12-081-5/+7
* | | | | | | | | | | | | Merge branch 'rs/fmt-merge-msg-leakfix'Junio C Hamano2017-12-271-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | transport-helper: plug strbuf and string_list leaksrs/fmt-merge-msg-leakfixRené Scharfe2017-12-081-2/+5
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jt/decorate-api'Junio C Hamano2017-12-278-25/+146
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | decorate: clean up and document APIjt/decorate-apiJonathan Tan2017-12-088-25/+146
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/cvsimport-quoting'Junio C Hamano2017-12-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | cvsimport: apply shell-quoting regex globallyjk/cvsimport-quotingJeff King2017-12-081-1/+1
* | | | | | | | | | | | | | Merge branch 'db/doc-workflows-neuter-the-maintainer'Junio C Hamano2017-12-271-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | doc: reword gitworkflows.txt for neutralitydb/doc-workflows-neuter-the-maintainerDaniel Bensoussan2017-12-081-2/+2
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'ks/branch-cleanup'Junio C Hamano2017-12-274-11/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | builtin/branch: strip refs/heads/ using skip_prefixks/branch-cleanupKaartic Sivaraam2017-12-071-4/+11
| * | | | | | | | | | | | | | branch: update warning message shown when copying a misnamed branchKaartic Sivaraam2017-12-071-1/+1
| * | | | | | | | | | | | | | branch: group related arguments of create_branch()Kaartic Sivaraam2017-12-074-7/+8