summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* RelNotes: the third batch for 2.16Junio C Hamano2017-11-091-0/+40
* Merge branch 'js/mingw-redirect-std-handles'Junio C Hamano2017-11-093-0/+88
|\
| * mingw: document the standard handle redirectionjs/mingw-redirect-std-handlesJohannes Schindelin2017-11-021-0/+18
| * mingw: optionally redirect stderr/stdout via the same handleJohannes Schindelin2017-11-022-1/+22
| * mingw: add experimental feature to redirect standard handlesJohannes Schindelin2017-11-022-0/+49
* | Merge branch 'js/wincred-empty-cred'Junio C Hamano2017-11-092-2/+27
|\ \
| * | wincred: handle empty username/password correctlyjs/wincred-empty-credJakub Bereżański2017-11-011-2/+8
| * | t0302: check helper can handle empty credentialsJakub Bereżański2017-11-011-0/+19
| |/
* | Merge branch 'js/mingw-full-version-in-resources'Junio C Hamano2017-11-092-3/+4
|\ \
| * | mingw: include the full version information in the resourcesjs/mingw-full-version-in-resourcesJohannes Schindelin2017-11-012-3/+4
* | | Merge branch 'dk/libsecret-unlock-to-load-fix'Junio C Hamano2017-11-091-1/+1
|\ \ \
| * | | credential-libsecret: unlock locked secretsdk/libsecret-unlock-to-load-fixDennis Kaarsemaker2017-11-041-1/+1
* | | | Merge branch 'ks/mailmap'Junio C Hamano2017-11-091-0/+1
|\ \ \ \
| * | | | mailmap: use Kaartic Sivaraam's new addressks/mailmapKaartic Sivaraam2017-11-031-0/+1
| | |_|/ | |/| |
* | | | Merge branch 'js/early-config'Junio C Hamano2017-11-091-1/+3
|\ \ \ \
| * | | | setup: avoid double slashes when looking for HEADjs/early-configJeff King2017-11-031-1/+3
* | | | | Merge branch 'sg/travis-fixes'Junio C Hamano2017-11-093-7/+13
|\ \ \ \ \
| * | | | | travis-ci: don't build Git for the static analysis jobSZEDER Gábor2017-11-021-1/+1
| * | | | | travis-ci: fix running P4 and Git LFS tests in Linux build jobsSZEDER Gábor2017-11-022-6/+12
* | | | | | Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano2017-11-0927-246/+260
|\ \ \ \ \ \
| * | | | | | diff: make struct diff_flags members lowercasebw/diff-opt-impl-to-bitfieldsBrandon Williams2017-11-0125-228/+228
| * | | | | | diff: remove DIFF_OPT_CLR macroBrandon Williams2017-11-017-24/+22
| * | | | | | diff: remove DIFF_OPT_SET macroBrandon Williams2017-11-0120-91/+90
| * | | | | | diff: remove DIFF_OPT_TST macroBrandon Williams2017-11-0117-84/+84
| * | | | | | diff: remove touched flagsBrandon Williams2017-11-012-6/+2
| * | | | | | diff: add flag to indicate textconv was set via cmdlineBrandon Williams2017-11-013-3/+5
| * | | | | | diff: convert flags to be stored in bitfieldsBrandon Williams2017-11-016-49/+68
| * | | | | | add, reset: use DIFF_OPT_SET macro to set a diff flagBrandon Williams2017-10-312-2/+2
* | | | | | | Merge branch 'rs/hex-to-bytes-cleanup'Junio C Hamano2017-11-095-36/+34
|\ \ \ \ \ \ \
| * | | | | | | sha1_file: use hex_to_bytes()rs/hex-to-bytes-cleanupRené Scharfe2017-11-011-13/+11
| * | | | | | | http-push: use hex_to_bytes()René Scharfe2017-11-011-6/+4
| * | | | | | | notes: move hex_to_bytes() to hex.c and export itRené Scharfe2017-11-013-17/+19
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'ad/5580-unc-tests-on-cygwin'Junio C Hamano2017-11-091-4/+10
|\ \ \ \ \ \ \
| * | | | | | | t5580: add Cygwin supportad/5580-unc-tests-on-cygwinAdam Dinwoodie2017-11-011-4/+10
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'ao/diff-populate-filespec-lstat-errorpath-fix'Junio C Hamano2017-11-091-8/+6
|\ \ \ \ \ \ \
| * | | | | | | diff: fix lstat() error handling in diff_populate_filespec()ao/diff-populate-filespec-lstat-errorpath-fixAndrey Okoshkin2017-10-291-8/+6