summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* rebase --keep-empty: always use interactive rebasepw/rebase-signoffPhillip Wood2018-03-293-47/+40
* rebase -p: error out if --signoff is givenPhillip Wood2018-03-291-0/+2
* rebase: extend --signoff supportPhillip Wood2018-03-296-9/+72
* Merge branch 'pw/rebase-keep-empty-fixes' into pw/rebase-signoffJunio C Hamano2018-03-294-3/+41
|\
| * rebase: respect --no-keep-emptypw/rebase-keep-empty-fixesPhillip Wood2018-03-291-0/+3
| * rebase -i --keep-empty: don't prune empty commitsPhillip Wood2018-03-292-3/+7
| * rebase --root: stop assuming squash_onto is unsetPhillip Wood2018-03-201-0/+1
| * Merge branch 'ys/bisect-object-id-missing-conversion-fix' into maintJunio C Hamano2018-02-271-3/+3
| |\
| * \ Merge branch 'sb/submodule-update-reset-fix' into maintJunio C Hamano2018-02-273-3/+23
| |\ \
| * \ \ Merge branch 'ab/commit-m-with-fixup' into maintJunio C Hamano2018-02-273-4/+15
| |\ \ \
| * \ \ \ Merge branch 'nd/ita-wt-renames-in-status' into maintJunio C Hamano2018-02-276-44/+143
| |\ \ \ \
| * | | | | Git 2.16.2v2.16.2Junio C Hamano2018-02-153-2/+32
| * | | | | Merge branch 'ab/doc-cat-file-e-still-shows-errors' into maintJunio C Hamano2018-02-151-3/+4
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'as/read-tree-prefix-doc-fix' into maintJunio C Hamano2018-02-151-3/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'nd/add-i-ignore-submodules' into maintJunio C Hamano2018-02-152-1/+49
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'tg/stash-with-pathspec-fix' into maintJunio C Hamano2018-02-152-3/+34
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/abort-clone-with-existing-dest' into maintJunio C Hamano2018-02-152-33/+98
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jc/merge-symlink-ours-theirs' into maintJunio C Hamano2018-02-152-4/+45
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/lose-leak-pending' into maintJunio C Hamano2018-02-1510-86/+46
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jm/svn-pushmergeinfo-fix' into maintJunio C Hamano2018-02-151-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dk/describe-all-output-fix' into maintJunio C Hamano2018-02-152-3/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/perf-grep-threads' into maintJunio C Hamano2018-02-152-21/+86
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pw/sequencer-in-process-commit'Junio C Hamano2018-02-1311-280/+765
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | sequencer: run 'prepare-commit-msg' hookpw/sequencer-in-process-commitPhillip Wood2018-01-244-19/+61
| * | | | | | | | | | | | | | | | t7505: add tests for cherry-pick and rebase -i/-pPhillip Wood2018-01-243-4/+157
| * | | | | | | | | | | | | | | | t7505: style fixesPhillip Wood2018-01-241-6/+8
| * | | | | | | | | | | | | | | | sequencer: assign only free()able strings to gpg_signJohannes Schindelin2017-12-222-1/+11
| * | | | | | | | | | | | | | | | sequencer: improve config handlingPhillip Wood2017-12-134-73/+61
| * | | | | | | | | | | | | | | | t3512/t3513: remove KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT=1Phillip Wood2017-11-242-2/+0
| * | | | | | | | | | | | | | | | sequencer: try to commit without forking 'git commit'Phillip Wood2017-11-241-2/+176
| * | | | | | | | | | | | | | | | sequencer: load commit related configPhillip Wood2017-11-244-3/+60
| * | | | | | | | | | | | | | | | sequencer: simplify adding Signed-off-by: trailerPhillip Wood2017-11-241-5/+3
| * | | | | | | | | | | | | | | | commit: move print_commit_summary() to libgitPhillip Wood2017-11-243-119/+133
| * | | | | | | | | | | | | | | | commit: move post-rewrite code to libgitPhillip Wood2017-11-183-41/+50
| * | | | | | | | | | | | | | | | Add a function to update HEAD after creating a commitPhillip Wood2017-11-183-19/+44
| * | | | | | | | | | | | | | | | commit: move empty message checks to libgitPhillip Wood2017-11-113-80/+91
| * | | | | | | | | | | | | | | | t3404: check intermediate squash messagesPhillip Wood2017-11-111-0/+4
* | | | | | | | | | | | | | | | | Merge branch 'nd/shared-index-fix'Junio C Hamano2018-02-132-18/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | read-cache: don't write index twice if we can't write shared indexnd/shared-index-fixNguyễn Thái Ngọc Duy2018-01-242-2/+22
| * | | | | | | | | | | | | | | | | read-cache.c: move tempfile creation/cleanup out of write_shared_indexNguyễn Thái Ngọc Duy2018-01-161-16/+17
| * | | | | | | | | | | | | | | | | read-cache.c: change type of "temp" in write_shared_index()Nguyễn Thái Ngọc Duy2018-01-161-9/+11
* | | | | | | | | | | | | | | | | | Merge branch 'po/http-push-error-message'Junio C Hamano2018-02-131-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | http-push: improve error logpo/http-push-error-messagePatryk Obara2018-01-241-0/+4
| | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'po/clang-format-functype-weight'Junio C Hamano2018-02-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | clang-format: adjust penalty for return type line breakpo/clang-format-functype-weightPatryk Obara2018-01-241-1/+1
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'jc/mailinfo-cleanup-fix'Junio C Hamano2018-02-131-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | mailinfo: avoid segfault when can't open filesjc/mailinfo-cleanup-fixJuan F. Codagnone2018-01-241-4/+6
* | | | | | | | | | | | | | | | | | | Merge branch 'sg/cocci-move-array'Junio C Hamano2018-02-139-27/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Use MOVE_ARRAYsg/cocci-move-arraySZEDER Gábor2018-01-229-27/+19
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'tg/split-index-fixes'Junio C Hamano2018-02-138-17/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \