summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* repository.h: add comment and clarify repo_set_gitdirnd/remove-ignore-env-fieldNguyễn Thái Ngọc Duy2018-03-231-1/+5
* repository: delete ignore_env memberNguyễn Thái Ngọc Duy2018-03-052-11/+0
* sha1_file.c: move delayed getenv(altdb) back to setup_git_env()Nguyễn Thái Ngọc Duy2018-03-054-5/+9
* repository.c: delete dead functionsNguyễn Thái Ngọc Duy2018-03-051-25/+0
* repository.c: move env-related setup code back to environment.cNguyễn Thái Ngọc Duy2018-03-055-25/+79
* repository: initialize the_repository in main()Nguyễn Thái Ngọc Duy2018-03-053-6/+16
* Second batch for 2.17Junio C Hamano2018-02-131-0/+77
* Merge branch 'tz/doc-show-defaults-to-head'Junio C Hamano2018-02-131-2/+2
|\
| * doc: mention 'git show' defaults to HEADtz/doc-show-defaults-to-headTodd Zullinger2018-01-301-2/+2
* | Merge branch 'ew/svn-branch-segfault-fix'Junio C Hamano2018-02-131-0/+5
|\ \
| * | git-svn: control destruction order to avoid segfaultew/svn-branch-segfault-fixEric Wong2018-01-301-0/+5
* | | Merge branch 'sg/travis-linux32-sanity'Junio C Hamano2018-02-134-18/+50
|\ \ \
| * | | travis-ci: don't fail if user already exists on 32 bit Linux build jobsg/travis-linux32-sanitySZEDER Gábor2018-01-301-1/+7
| * | | travis-ci: don't run the test suite as root in the 32 bit Linux buildSZEDER Gábor2018-01-302-6/+26
| * | | travis-ci: don't repeat the path of the cache directorySZEDER Gábor2018-01-304-6/+11
| * | | travis-ci: use 'set -e' in the 32 bit Linux build jobSZEDER Gábor2018-01-301-10/+10
| * | | travis-ci: use 'set -x' for the commands under 'su' in the 32 bit Linux buildSZEDER Gábor2018-01-301-0/+1
* | | | Merge branch 'nd/list-merge-strategy'Junio C Hamano2018-02-131-1/+1
|\ \ \ \
| * | | | completion: fix completing merge strategies on non-C localesnd/list-merge-strategyDuy Nguyen2018-01-261-1/+1
| | |/ / | |/| |
* | | | Merge branch 'jt/long-running-process-doc'Junio C Hamano2018-02-134-48/+61
|\ \ \ \
| * | | | Docs: split out long-running subprocess handshakejt/long-running-process-docJonathan Tan2018-01-254-48/+61
| | |/ / | |/| |
* | | | Merge branch 'jk/daemon-fixes'Junio C Hamano2018-02-134-20/+107
|\ \ \ \
| * | | | daemon: fix length computation in newline strippingjk/daemon-fixesJeff King2018-01-252-4/+17
| * | | | t/lib-git-daemon: add network-protocol helpersJeff King2018-01-252-1/+58
| * | | | daemon: handle NULs in extended attribute stringJeff King2018-01-252-8/+9
| * | | | daemon: fix off-by-one in logging extended attributesJeff King2018-01-252-2/+13
| * | | | t/lib-git-daemon: record daemon logJeff King2018-01-251-4/+12
| * | | | t5570: use ls-remote instead of clone for interp testsJeff King2018-01-251-6/+3
| | |/ / | |/| |
* | | | 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
|\ \ \ \ \ \