summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* subtree: add --edit optionmo/subtree-split-updatesMatthew Ogilvie2013-12-102-8/+33
* subtree: allow --squash and --message with pushMatthew Ogilvie2013-12-102-10/+7
* subtree: support split --rejoin --squashMatthew Ogilvie2013-12-102-23/+62
* Merge git://repo.or.cz/git-guiJunio C Hamano2013-12-098-17/+56
|\
| * git-gui: correct spelling errors in commentsMasanari Iida2013-11-154-5/+5
| * git-gui: add menu item to launch a bash shell on Windows.Pat Thoyts2013-09-121-0/+10
| * git-gui: corrected setup of git worktree under cygwin.John Murphy2013-09-061-1/+5
| * git-gui: right half window is panedMax Kirillov2013-08-271-5/+11
| * git-gui: Add gui.displayuntracked optionMax Kirillov2013-08-272-4/+11
| * git-gui: show the maxrecentrepo config option in the preferences dialogPat Thoyts2013-08-272-0/+2
| * git-gui: added gui.maxrecentrepo to extend the number of remembered reposPat Thoyts2013-08-271-2/+10
| * git-gui: Improve font rendering on retina macbooksMads Dørup2013-08-271-0/+2
* | Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2013-12-091-210/+353
|\ \
| * | gitk: Recognize -L optionThomas Rast2013-12-021-0/+8
| * | gitk: Support showing the gathered inline diffsThomas Rast2013-12-021-0/+38
| * | gitk: Split out diff part in $commitinfoThomas Rast2013-12-021-1/+10
| * | gitk: Refactor per-line part of getblobdiffline and its supportThomas Rast2013-12-021-195/+213
| * | gitk: Support -G option from the command lineThomas Rast2013-12-021-1/+1
| * | gitk: Tag display improvementsPaul Mackerras2013-10-311-13/+83
* | | Start 1.9 cycleJunio C Hamano2013-12-063-2/+135
* | | Merge branch 'jk/remove-experimental-loose-object-support'Junio C Hamano2013-12-0619-143/+0
|\ \ \
| * | | drop support for "experimental" loose objectsjk/remove-experimental-loose-object-supportJeff King2013-11-2119-143/+0
* | | | Merge branch 'nd/magic-pathspec'Junio C Hamano2013-12-062-10/+13
|\ \ \ \
| * | | | diff: restrict pathspec limitations to diff b/f case onlynd/magic-pathspecNguyễn Thái Ngọc Duy2013-11-202-10/+13
* | | | | Merge branch 'rr/for-each-ref-decoration'Junio C Hamano2013-12-063-27/+150
|\ \ \ \ \
| * | | | | for-each-ref: avoid color leakagerr/for-each-ref-decorationRamkumar Ramachandra2013-11-192-6/+24
| * | | | | for-each-ref: introduce %(color:...) for colorRamkumar Ramachandra2013-11-193-2/+30
| * | | | | for-each-ref: introduce %(upstream:track[short])Ramkumar Ramachandra2013-11-193-4/+69
| * | | | | for-each-ref: introduce %(HEAD) asterisk markerRamkumar Ramachandra2013-11-183-2/+17
| * | | | | t6300 (for-each-ref): don't hardcode SHA-1 hexesRamkumar Ramachandra2013-11-181-8/+8
| * | | | | t6300 (for-each-ref): clearly demarcate setupRamkumar Ramachandra2013-11-181-5/+2
* | | | | | Merge branch 'jc/bundle'Junio C Hamano2013-12-061-16/+16
|\ \ \ \ \ \
| * | | | | | bundle: use argv-arrayJunio C Hamano2013-11-121-16/+16
* | | | | | | Merge branch 'rh/remote-hg-bzr-updates'Junio C Hamano2013-12-065-24/+29
|\ \ \ \ \ \ \
| * | | | | | | remote-bzr, remote-hg: fix email address regular expressionrh/remote-hg-bzr-updatesRichard Hansen2013-11-183-9/+8
| * | | | | | | test-hg.sh: help user correlate verbose output with email testRichard Hansen2013-11-181-10/+10
| * | | | | | | test-hg.sh: fix duplicate content strings in author testsRichard Hansen2013-11-181-9/+9
| * | | | | | | test-hg.sh: avoid obsolete 'test' syntaxRichard Hansen2013-11-181-1/+1
| * | | | | | | test-hg.sh: eliminate 'local' bashismRichard Hansen2013-11-181-2/+2
| * | | | | | | test-bzr.sh, test-hg.sh: prepare for change to push.default=simpleRichard Hansen2013-11-181-1/+1
| * | | | | | | test-bzr.sh, test-hg.sh: allow running from any dirFelipe Contreras2013-11-182-2/+4
| * | | | | | | test-lib.sh: convert $TEST_DIRECTORY to an absolute pathFelipe Contreras2013-11-181-0/+4
* | | | | | | | Merge branch 'jn/perl-lib-extra'Junio C Hamano2013-12-062-2/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | Makefile: add PERLLIB_EXTRA variable that adds to default perl pathjn/perl-lib-extraJonathan Nieder2013-11-181-1/+4
| * | | | | | | | Makefile: rebuild perl scripts when perl paths changeJonathan Nieder2013-11-182-2/+12
* | | | | | | | | Merge branch 'gj/push-more-verbose-advice' (early part)Junio C Hamano2013-12-051-0/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | push: enhance unspecified push default warningGreg Jacobson2013-11-131-0/+7
* | | | | | | | | | Merge branch 'jn/mediawiki-makefile-updates'Junio C Hamano2013-12-051-2/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-remote-mediawiki build: handle DESTDIR/INSTLIBDIR with whitespacejn/mediawiki-makefile-updatesJonathan Nieder2013-11-111-2/+4
| * | | | | | | | | | git-remote-mediawiki build: make 'install' command configurableJonathan Nieder2013-11-111-2/+4