summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* lockfile.c: store absolute pathnd/lockfile-absoluteNguyễn Thái Ngọc Duy2014-11-032-3/+26
* Git 2.2.0-rc0v2.2.0-rc0Junio C Hamano2014-10-312-1/+7
* Merge branch 'for-junio' of git://bogomips.org/git-svnJunio C Hamano2014-10-314-91/+145
|\
| * git-svn: use SVN::Ra::get_dir2 when possibleEric Wong2014-10-311-1/+11
| * git-svn: add space after "W:" prefix in warningEric Wong2014-10-301-4/+2
| * git-svn: (cleanup) remove editor param passingEric Wong2014-10-301-6/+4
| * git-svn: prepare SVN::Ra config pieces onceEric Wong2014-10-291-27/+36
| * Git.pm: add specified name to tempfile templateEric Wong2014-10-291-1/+4
| * git-svn: disable _rev_list memoizationEric Wong2014-10-271-10/+0
| * git-svn: save a little memory as fetch progressesEric Wong2014-10-251-1/+1
| * git-svn: remove unnecessary DESTROY overrideEric Wong2014-10-251-4/+0
| * git-svn: reload RA every log-window-sizeEric Wong2014-10-241-8/+13
| * git-svn.txt: advertise pushurl with dcommitSveinung Kvilhaugsvik2014-10-241-0/+4
| * git-svn: remove mergeinfo rev cachingEric Wong2014-10-241-21/+9
| * git-svn: cache only mergeinfo revisionsEric Wong2014-10-241-14/+8
| * git-svn: reduce check_cherry_pick cache overheadEric Wong2014-10-241-13/+15
| * git-svn: only look at the root path for svn:mergeinfoJakob Stoklund Olesen2014-10-241-16/+13
| * git-svn: only look at the new parts of svn:mergeinfoJakob Stoklund Olesen2014-10-241-12/+72
* | Merge branch 'jc/push-cert'Junio C Hamano2014-10-311-2/+2
|\ \
| * | receive-pack: avoid minor leak in case start_async() failsRené Scharfe2014-10-281-2/+2
* | | Merge branch 'rs/child-process-init'Junio C Hamano2014-10-311-1/+1
|\ \ \
| * | | api-run-command: add missing list item markerRené Scharfe2014-10-281-1/+1
* | | | Merge branch 'rs/grep-color-words'Junio C Hamano2014-10-314-9/+123
|\ \ \ \
| * | | | grep: add color.grep.matchcontext and color.grep.matchselectedrs/grep-color-wordsRené Scharfe2014-10-284-9/+123
* | | | | Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2014-10-301-69/+23
|\ \ \ \ \
| * | | | | gitk: Remove boilerplate for configuration variablesMax Kirillov2014-10-301-68/+20
| * | | | | gitk: Show detached HEAD if --all is specifiedMax Kirillov2014-10-301-0/+2
| * | | | | gitk: Do not depend on Cygwin's "kill" command on WindowsSebastian Schuberth2014-10-301-1/+1
* | | | | | Sync with Git 2.1.3Junio C Hamano2014-10-292-1/+28
|\ \ \ \ \ \
| * | | | | | Git 2.1.3v2.1.3Junio C Hamano2014-10-294-3/+30
| * | | | | | Merge branch 'jk/pack-objects-no-bitmap-when-splitting' into maintJunio C Hamano2014-10-292-0/+10
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'da/mergetool-meld' into maintJunio C Hamano2014-10-292-2/+16
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rm/gitweb-start-form' into maintJunio C Hamano2014-10-291-2/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'bc/asciidoc-pretty-formats-fix' into maintJunio C Hamano2014-10-291-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'rs/daemon-fixes' into maintJunio C Hamano2014-10-291-18/+15
| |\ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | Update draft release notes to 2.2Junio C Hamano2014-10-291-0/+17
* | | | | | | | | | | | Merge branch 'da/difftool'Junio C Hamano2014-10-294-1/+85
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | difftool: add support for --trust-exit-codeDavid Aguilar2014-10-284-0/+75
| * | | | | | | | | | | | difftool--helper: exit when reading a prompt answer failsJohannes Sixt2014-10-272-1/+10
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'rb/pack-window-memory-config-doc'Junio C Hamano2014-10-291-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | config.txt: pack.windowmemory limit applies per-threadrb/pack-window-memory-config-docRobert de Bath2014-10-281-4/+5
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'mg/lib-gpg-ro-safety'Junio C Hamano2014-10-291-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t/lib-gpg: make gpghome files writablemg/lib-gpg-ro-safetyMichael J Gruber2014-10-271-0/+1
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'dm/port2zos'Junio C Hamano2014-10-293-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | compat/bswap.h: detect endianness from XL C compiler macrosdm/port2zosDavid Michael2014-10-271-0/+4
| * | | | | | | | | | | | Makefile: reorder linker flags in the git executable ruleDavid Michael2014-10-271-2/+2
| * | | | | | | | | | | | git-compat-util.h: support variadic macros with the XL C compilerDavid Michael2014-10-271-1/+1
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'oc/mergetools-beyondcompare'Junio C Hamano2014-10-294-27/+28
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | mergetool: rename bc3 to bcoc/mergetools-beyondcompareJunio C Hamano2014-10-214-27/+28
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'jk/prune-mtime'Junio C Hamano2014-10-2923-436/+836
|\ \ \ \ \ \ \ \ \ \ \ \