summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* MinGW: update tests to handle a native eol of crlfBrice Lambson2014-09-022-20/+35
* Makefile: propagate NATIVE_CRLF to CPat Thoyts2014-09-022-0/+23
* t0027: Tests for core.eol=native, eol=lf, eol=crlfTorsten Bögershausen2014-08-281-100/+120
* t0027: combinations of core.autocrlf, core.eol and textTorsten Bögershausen2014-07-081-0/+265
* t0025: rename the test filesTorsten Bögershausen2014-07-081-61/+61
* Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2014-06-271-6/+18
|\
| * gitk: Add visiblerefs option, which lists always-shown branchesMax Kirillov2014-06-271-4/+6
| * gitk: Catch mkdtemp errorsDavid Aguilar2014-06-271-1/+3
| * gitk: Use mktemp -d to avoid predictable temporary directoriesDavid Aguilar2014-06-151-1/+2
| * gitk: Honor TMPDIR when viewing external diffsDavid Aguilar2014-06-151-2/+9
* | Merge early parts from git://ozlabs.org/~paulus/gitk.gitJunio C Hamano2014-06-262-6/+1391
|\|
| * gitk: Show staged submodules regardless of ignore configJens Lehmann2014-06-151-3/+10
| * gitk: Allow displaying time zones from author and commit dates timestampsAnders Kaseorg2014-06-151-1/+23
| * gitk: Switch to patch mode when searching for line originMax Kirillov2014-06-151-2/+6
| * gitk: Replace SHA1 entry field on keyboard pasteIlya Bobyr2014-06-151-0/+1
| * gitk: Merge branch 'new' of https://github.com/vnwildman/gitkPaul Mackerras2014-02-211-0/+1351
| |\
| | * l10n: Init Vietnamese translationTrần Ngọc Quân2013-12-141-0/+1351
* | | Merge git://repo.or.cz/git-guiJunio C Hamano2014-06-262-1/+8
|\ \ \
| * | | git-gui: tolerate major version changes when comparing the git versionJens Lehmann2014-06-131-2/+2
| * | | git-gui: show staged submodules regardless of ignore configJens Lehmann2014-06-132-1/+8
* | | | Sync with maintJunio C Hamano2014-06-252-1/+117
|\ \ \ \
| * | | | Git 2.0.1v2.0.1Junio C Hamano2014-06-254-3/+119
| * | | | Merge branch 'na/no-http-test-in-the-middle' into maintJunio C Hamano2014-06-252-59/+100
| |\ \ \ \
| * \ \ \ \ Merge branch 'jl/status-added-submodule-is-never-ignored' into maintJunio C Hamano2014-06-255-8/+108
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ym/fix-opportunistic-index-update-race' into maintJunio C Hamano2014-06-256-5/+90
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'mk/show-s-no-extra-blank-line-for-merges' into maintJunio C Hamano2014-06-254-11/+15
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rr/rebase-autostash-fix' into maintJunio C Hamano2014-06-253-3/+27
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/shortlog-ref-exclude' into maintJunio C Hamano2014-06-252-0/+7
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jl/remote-rm-prune' into maintJunio C Hamano2014-06-253-9/+52
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'fc/rerere-conflict-style' into maintJunio C Hamano2014-06-251-0/+2
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/pack-objects-no-unnecessary-realloc' into maintJunio C Hamano2014-06-251-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dt/merge-recursive-case-insensitive' into maintJunio C Hamano2014-06-253-1/+61
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/mailinfo-header-cmp' into maintJunio C Hamano2014-06-251-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/index-pack-report-missing' into maintJunio C Hamano2014-06-251-2/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/index-pack-one-fd-per-thread' into maintJunio C Hamano2014-06-253-18/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sk/spawn-less-case-insensitively-from-grep-O-i' into maintJunio C Hamano2014-06-251-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/daemonize-gc' into maintJunio C Hamano2014-06-251-6/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/diff-follow-must-take-one-pathspec' into maintJunio C Hamano2014-06-252-6/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/diff-files-assume-unchanged' into maintJunio C Hamano2014-06-252-12/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/commit-C-pick-empty' into maintJunio C Hamano2014-06-252-4/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bc/blame-crlf-test' into maintJunio C Hamano2014-06-252-1/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jx/blame-align-relative-time' into maintJunio C Hamano2014-06-251-8/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/apply-ignore-whitespace' into maintJunio C Hamano2014-06-252-13/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/complete-merge-pull' into maintJunio C Hamano2014-06-251-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ow/config-mailmap-pathname' into maintJunio C Hamano2014-06-251-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'as/pretty-truncate' into maintJunio C Hamano2014-06-255-72/+282
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/revision-dash-count-parsing' into maintJunio C Hamano2014-06-251-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/report-fail-to-read-objects-better' into maintJunio C Hamano2014-06-251-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mn/sideband-no-ansi' into maintJunio C Hamano2014-06-251-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'je/pager-do-not-recurse' into maintJunio C Hamano2014-06-251-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-21 07:09:45 +0100