summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Documentation: git-gui: describe gui.displayuntrackedmk/doc-git-gui-display-untrackedMax Kirillov2014-04-211-0/+4
* Git 2.0-rc0v2.0.0-rc0Junio C Hamano2014-04-182-1/+6
* Merge branch 'jk/config-die-bad-number-noreturn'Junio C Hamano2014-04-181-0/+1
|\
| * config.c: mark die_bad_number as NORETURNjk/config-die-bad-number-noreturnJeff King2014-04-161-0/+1
* | Merge branch 'fc/remote-helper-fixes'Junio C Hamano2014-04-185-5/+34
|\ \
| * | remote-bzr: trivial test fixfc/remote-helper-fixesFelipe Contreras2014-04-141-1/+1
| * | remote-bzr: include authors field in pushed commitsdequis2014-04-092-0/+26
| * | remote-bzr: add support for older versionsFelipe Contreras2014-04-091-2/+2
| * | remote-hg: always normalize pathsFelipe Contreras2014-04-091-0/+1
| * | remote-helpers: allow all tests running from any dirFelipe Contreras2014-04-092-2/+4
* | | Merge branch 'fc/complete-aliased-push'Junio C Hamano2014-04-182-0/+2
|\ \ \
| * | | completion: fix completing args of aliased "push", "fetch", etc.fc/complete-aliased-pushFelipe Contreras2014-04-092-0/+2
* | | | Merge branch 'fc/prompt-zsh-read-from-file'Junio C Hamano2014-04-181-7/+14
|\ \ \ \
| * | | | prompt: fix missing file errors in zshFelipe Contreras2014-04-141-7/+14
| |/ / /
* | | | Update draft release notes for 2.0Junio C Hamano2014-04-161-0/+11
* | | | Merge branch 'mh/multimail'Junio C Hamano2014-04-165-56/+249
|\ \ \ \
| * | | | git-multimail: update to version 1.0.0mh/multimailMichael Haggerty2014-04-075-56/+249
* | | | | Merge branch 'tb/unicode-6.3-zero-width'Junio C Hamano2014-04-161-5/+4
|\ \ \ \ \
| * | | | | utf8.c: partially update to version 6.3Torsten Bögershausen2014-04-091-5/+4
| |/ / / /
* | | | | Merge branch 'km/avoid-cp-a'Junio C Hamano2014-04-161-2/+2
|\ \ \ \ \
| * | | | | test: fix t7001 cp to use POSIX optionskm/avoid-cp-aKyle J. McKay2014-04-111-2/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch 'km/avoid-bs-in-shell-glob'Junio C Hamano2014-04-161-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | test: fix t5560 on FreeBSDkm/avoid-bs-in-shell-globKyle J. McKay2014-04-111-2/+2
| |/ / /
* | | | Sync with 1.9.2Junio C Hamano2014-04-093-2/+23
|\ \ \ \ | | |_|/ | |/| |
| * | | Git 1.9.2v1.9.2Junio C Hamano2014-04-093-2/+23
| * | | Merge branch 'jl/nor-or-nand-and' into maintJunio C Hamano2014-04-0957-90/+88
| |\ \ \
| * \ \ \ Merge branch 'cn/fetch-prune-overlapping-destination' into maintJunio C Hamano2014-04-092-6/+64
| |\ \ \ \
| * \ \ \ \ Merge branch 'mh/update-ref-batch-create-fix' into maintJunio C Hamano2014-04-092-0/+12
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/commit-dates-parsing-fix' into maintJunio C Hamano2014-04-095-4/+47
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/fix-diff-no-index-diff-opt-parse' into maintJunio C Hamano2014-04-091-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge commit 'doc/http-backend: missing accent grave in literal mark-up'Junio C Hamano2014-04-091-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | doc/http-backend: missing accent grave in literal mark-upThomas Ackermann2014-04-091-1/+1
* | | | | | | | | | Update draft release notes to 2.0Junio C Hamano2014-04-081-17/+11
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2014-04-081-0/+9
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Update draft release notes to 1.9.2Junio C Hamano2014-04-081-0/+9
| * | | | | | | | | Merge branch 'mm/status-porcelain-format-i18n-fix' into maintJunio C Hamano2014-04-082-5/+9
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'bp/commit-p-editor' into maintJunio C Hamano2014-04-0810-39/+137
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/pack-bitmap'Junio C Hamano2014-04-086-6/+56
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | pack-objects: do not reuse packfiles without --delta-base-offsetJeff King2014-04-041-1/+12
| * | | | | | | | | | | | add `ignore_missing_links` mode to revwalkVicent Marti2014-04-045-5/+44
* | | | | | | | | | | | | Merge branch 'jl/nor-or-nand-and'Junio C Hamano2014-04-0857-90/+88
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | code and test: fix misuses of "nor"jl/nor-or-nand-andJustin Lebar2014-03-3112-16/+16
| * | | | | | | | | | | | comments: fix misuses of "nor"Justin Lebar2014-03-3120-27/+26
| * | | | | | | | | | | | contrib: fix misuses of "nor"Justin Lebar2014-03-312-3/+3
| * | | | | | | | | | | | Documentation: fix misuses of "nor"Justin Lebar2014-03-3125-44/+43
* | | | | | | | | | | | | Merge branch 'mh/update-ref-batch-create-fix'Junio C Hamano2014-04-082-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | update-ref: fail create operation over stdin if ref already existsmh/update-ref-batch-create-fixAman Gupta2014-04-022-0/+12
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'mr/opt-set-ptr'Junio C Hamano2014-04-085-19/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | parse-options: remove unused OPT_SET_PTRmr/opt-set-ptrMarat Radchenko2014-03-315-19/+4
| * | | | | | | | | | | | parse-options: add cast to correct pointer type to OPT_SET_PTRJunio C Hamano2014-03-312-2/+2