summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/merge-quit'Junio C Hamano2019-06-135-14/+61
|\
| * merge: add --quitNguyễn Thái Ngọc Duy2019-05-193-0/+43
| * merge: remove drop_save() in favor of remove_merge_branch_state()Nguyễn Thái Ngọc Duy2019-05-133-15/+19
* | Merge branch 'ab/fail-prereqs-in-test'Junio C Hamano2019-06-137-10/+43
|\ \
| * | tests: add a special setup where prerequisites failÆvar Arnfjörð Bjarmason2019-05-147-10/+43
* | | Merge branch 'nd/corrupt-worktrees'Junio C Hamano2019-06-132-2/+17
|\ \ \
| * | | worktree add: be tolerant of corrupt worktreesNguyễn Thái Ngọc Duy2019-05-152-2/+17
| | |/ | |/|
* | | Merge branch 'js/rebase-cleanup'Junio C Hamano2019-06-138-167/+58
|\ \ \
| * | | rebase: fold git-rebase--common into the -p backendJohannes Schindelin2019-05-155-73/+56
| * | | sequencer: the `am` and `rebase--interactive` scripts are goneJohannes Schindelin2019-05-151-1/+1
| * | | .gitignore: there is no longer a built-in `git-rebase--interactive`Johannes Schindelin2019-05-151-1/+0
| * | | t3400: stop referring to the scripted rebaseJohannes Schindelin2019-05-151-1/+1
| * | | Drop unused git-rebase--am.shJohannes Schindelin2019-05-154-91/+0
| | |/ | |/|
* | | Merge branch 'nd/worktree-name-sanitization'Junio C Hamano2019-06-134-21/+110
|\ \ \
| * | | worktree add: sanitize worktree namesNguyễn Thái Ngọc Duy2019-05-154-21/+110
* | | | Merge branch 'en/fast-export-encoding'Junio C Hamano2019-06-138-17/+163
|\ \ \ \
| * | | | fast-export: do automatic reencoding of commit messages only if requestedElijah Newren2019-05-143-6/+85
| * | | | fast-export: differentiate between explicitly UTF-8 and implicitly UTF-8Elijah Newren2019-05-141-1/+1
| * | | | fast-export: avoid stripping encoding header if we cannot reencodeElijah Newren2019-05-143-2/+27
| * | | | fast-import: support 'encoding' commit headerElijah Newren2019-05-143-2/+36
| * | | | t9350: fix encoding test to actually test reencodingElijah Newren2019-05-142-10/+18
* | | | | Merge branch 'jk/unused-params-final-batch'Junio C Hamano2019-06-1322-72/+53
|\ \ \ \ \
| * | | | | verify-commit: simplify parameters to run_gpg_verify()Jeff King2019-05-131-15/+8
| * | | | | show-branch: drop unused parameter from show_independent()Jeff King2019-05-131-2/+1
| * | | | | rev-list: drop unused void pointer from finish_commit()Jeff King2019-05-131-5/+5
| * | | | | remove_all_fetch_refspecs(): drop unused "remote" parameterJeff King2019-05-131-2/+2
| * | | | | receive-pack: drop unused "commands" from prepare_shallow_update()Jeff King2019-05-131-3/+2
| * | | | | pack-objects: drop unused rev_info parametersJeff King2019-05-131-4/+4
| * | | | | name-rev: drop unused parameters from is_better_name()Jeff King2019-05-131-4/+1
| * | | | | mktree: drop unused length parameterJeff King2019-05-131-2/+2
| * | | | | wt-status: drop unused status parameterJeff King2019-05-131-4/+2
| * | | | | read-cache: drop unused parameter from threaded loadJeff King2019-05-131-2/+2
| * | | | | clone: drop dest parameter from copy_alternates()Jeff King2019-05-131-3/+2
| * | | | | submodule: drop unused prefix parameter from some functionsJeff King2019-05-134-13/+9
| * | | | | builtin: consistently pass cmd_* prefix to parse_optionsJeff King2019-05-135-5/+5
| * | | | | cmd_{read,write}_tree: rename "unused" variable that is usedJeff King2019-05-132-8/+8
* | | | | | Merge branch 'sb/format-patch-base-patch-id-fix'Junio C Hamano2019-06-137-32/+66
|\ \ \ \ \ \
| * | | | | | format-patch: make --base patch-id output stableStephen Boyd2019-05-088-34/+42
| * | | | | | format-patch: inform user that patch-id generation is unstableStephen Boyd2019-05-082-6/+32
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'nd/init-relative-template-fix'Junio C Hamano2019-06-133-4/+7
|\ \ \ \ \ \
| * | | | | | init: make --template path relative to $CWDNguyễn Thái Ngọc Duy2019-05-133-4/+7
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'ab/send-email-transferencoding-fix'Junio C Hamano2019-06-133-109/+206
|\ \ \ \ \ \
| * | | | | | send-email: fix regression in sendemail.identity parsingÆvar Arnfjörð Bjarmason2019-05-293-19/+108
| * | | | | | send-email: document --no-[to|cc|bcc]Ævar Arnfjörð Bjarmason2019-05-191-0/+4
| * | | | | | send-email: fix broken transferEncoding testsÆvar Arnfjörð Bjarmason2019-05-191-24/+11
| * | | | | | send-email: remove cargo-culted multi-patch pattern in testsÆvar Arnfjörð Bjarmason2019-05-191-7/+7
| * | | | | | send-email: do defaults -> config -> getopt in that orderÆvar Arnfjörð Bjarmason2019-05-132-43/+61
| * | | | | | send-email: rename the @bcclist variable for consistencyÆvar Arnfjörð Bjarmason2019-05-131-5/+5
| * | | | | | send-email: move the read_config() function above getoptsÆvar Arnfjörð Bjarmason2019-05-131-49/+48
* | | | | | | Git 2.22v2.22.0Junio C Hamano2019-06-071-1/+1