summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | * | | | | | l10n: de.po: fix typosAndre Hinrichs2018-04-111-2/+2
| | | | * | | | | | | l10n: TEAMS: remove inactive de team membersRalf Thielow2018-04-151-5/+1
| | | | * | | | | | | l10n: Update Catalan translationJordi Mas2018-04-101-710/+1067
* | | | | | | | | | | A bunch of micro-fixes before going 2.18 finalJunio C Hamano2018-06-181-0/+11
* | | | | | | | | | | Merge branch 'sb/blame-color'Junio C Hamano2018-06-181-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | blame: release string_list after use in parse_color_fields()René Scharfe2018-06-141-0/+1
* | | | | | | | | | | | Merge branch 'mw/doc-merge-enumfix'Junio C Hamano2018-06-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | doc: update the order of the syntax `git merge --continue`Meng-Sung Wu2018-06-141-1/+1
* | | | | | | | | | | | | Merge branch 'en/rename-directory-detection'Junio C Hamano2018-06-181-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | merge-recursive: use xstrdup() instead of fixed bufferRené Scharfe2018-06-141-5/+5
* | | | | | | | | | | | | | Merge branch 'rd/doc-remote-tracking-with-hyphen'Junio C Hamano2018-06-183-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Use hyphenated "remote-tracking branch" (docs and comments)Robert P. J. Day2018-06-133-5/+5
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jl/zlib-restore-nul-termination'Junio C Hamano2018-06-181-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | packfile: correct zlib buffer handlingJeremy Linton2018-06-131-0/+3
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'ab/cred-netrc-no-autodie'Junio C Hamano2018-06-181-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | git-credential-netrc: remove use of "autodie"Ævar Arnfjörð Bjarmason2018-06-131-1/+0
* | | | | | | | | | | | | | | Merge branch 'km/doc-workflows-typofix'Junio C Hamano2018-06-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | gitworkflows: fix grammar in 'Merge upwards' ruleKyle Meyer2018-06-121-1/+1
* | | | | | | | | | | | | | | | Merge branch 'ld/git-p4-updates'Junio C Hamano2018-06-185-24/+307
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | git-p4: auto-size the blockLuke Diamand2018-06-122-6/+29
| * | | | | | | | | | | | | | | | git-p4: narrow the scope of exceptions caught when parsing an intLuke Diamand2018-06-121-1/+1
| * | | | | | | | | | | | | | | | git-p4: raise exceptions from p4CmdList based on error from p4 serverLuke Diamand2018-06-121-4/+40
| * | | | | | | | | | | | | | | | git-p4: better error reporting when p4 failsLuke Diamand2018-06-122-0/+133
| * | | | | | | | | | | | | | | | git-p4: add option to disable syncing of p4/master with p4Luke Diamand2018-06-122-11/+28
| * | | | | | | | | | | | | | | | git-p4: disable-rebase: allow setting this via configurationLuke Diamand2018-06-122-2/+5
| * | | | | | | | | | | | | | | | git-p4: add options --commit and --disable-rebaseRomain Merland2018-06-123-6/+77
* | | | | | | | | | | | | | | | | Merge branch 'rd/diff-options-typofix'Junio C Hamano2018-06-181-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | diff-options.txt: fix minor typos, font inconsistencies, in docsRobert P. J. Day2018-06-111-4/+4
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'rd/comment-typofix-in-sha1-file'Junio C Hamano2018-06-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | sha1-file.c: correct $GITDIR to $GIT_DIR in a commentRobert P. J. Day2018-06-041-1/+1
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | RelNotes 2.18: minor fix to entry about dynamically loading completionsSZEDER Gábor2018-06-181-1/+1
| |_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Git 2.18-rc2v2.18.0-rc2Junio C Hamano2018-06-132-1/+7
* | | | | | | | | | | | | | | | Merge branch 'jk/index-pack-maint'Junio C Hamano2018-06-134-2/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | index-pack: correct install_packed_git() argsJunio C Hamano2018-06-111-1/+1
| * | | | | | | | | | | | | | | | index-pack: handle --strict checks of non-repo packsJeff King2018-06-012-2/+16
| * | | | | | | | | | | | | | | | prepare_commit_graft: treat non-repository as a noopJeff King2018-06-012-0/+9
* | | | | | | | | | | | | | | | | Merge branch 'sg/completion-zsh-workaround'Junio C Hamano2018-06-132-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | completion: correct zsh detection when run from git-completion.zshSZEDER Gábor2018-06-122-2/+5
* | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-merge-in-merge-recursive'Junio C Hamano2018-06-131-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | merge-submodule: reduce output verbosityLeif Middelschulte2018-06-111-2/+2
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/submodule-fsck-loose-fixup'Junio C Hamano2018-06-132-8/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | fsck: avoid looking at NULL blob->objectJeff King2018-06-112-1/+20
| * | | | | | | | | | | | | | | | | | | t7415: don't bother creating commit for symlink testJeff King2018-06-111-7/+4
* | | | | | | | | | | | | | | | | | | | RelNotes 2.18: clarify where directory rename detection appliesElijah Newren2018-06-131-1/+1
* | | | | | | | | | | | | | | | | | | | RelNotes 2.18: typofixesJunio C Hamano2018-06-111-2/+2
| |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Git 2.18-rc1v2.18.0-rc1Junio C Hamano2018-06-042-1/+13
* | | | | | | | | | | | | | | | | | | Merge branch 'bc/t3430-fixup'Junio C Hamano2018-06-041-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | t3430: test clean-upbrian m. carlson2018-06-041-3/+2
* | | | | | | | | | | | | | | | | | | | Merge branch 'bw/refspec-api'Junio C Hamano2018-06-041-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | refspec-api: avoid uninitialized field in refspec itemJunio C Hamano2018-06-011-0/+2