summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* remote: fix status with branch...rebase=preservefc/trivialFelipe Contreras2013-12-091-2/+7
* fetch: add missing documentationFelipe Contreras2013-12-091-0/+3
* t: trivial whitespace cleanupsFelipe Contreras2013-12-092-3/+1
* abspath: trivial style fixFelipe Contreras2013-12-091-1/+1
* 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
| * | | | | | | | git-remote-mediawiki: honor DESTDIR in "make install"Jonathan Nieder2013-11-111-1/+3
| * | | | | | | | git-remote-mediawiki: do not remove installed files in "clean" targetJonathan Nieder2013-11-111-1/+0
* | | | | | | | | Merge branch 'jl/submodule-update-retire-orig-flags'Junio C Hamano2013-12-052-4/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | submodule update: remove unnecessary orig_flags variablejl/submodule-update-retire-orig-flagsJens Lehmann2013-11-112-4/+12
* | | | | | | | | | Merge branch 'nd/wt-status-align-i18n'Junio C Hamano2013-12-051-27/+53
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | wt-status: take the alignment burden off translatorsnd/wt-status-align-i18nNguyễn Thái Ngọc Duy2013-11-061-27/+53
* | | | | | | | | | | Merge branch 'sb/sha1-loose-object-info-check-existence'Junio C Hamano2013-12-052-6/+15
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | sha1_loose_object_info(): do not return success on missing objectsb/sha1-loose-object-info-check-existenceJunio C Hamano2013-11-062-6/+15
* | | | | | | | | | | | Merge branch 'jk/two-way-merge-corner-case-fix'Junio C Hamano2013-12-053-97/+121
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t1005: add test for "read-tree --reset -u A B"jk/two-way-merge-corner-case-fixJunio C Hamano2013-11-041-0/+15
| * | | | | | | | | | | | t1005: reindentJunio C Hamano2013-11-042-89/+89
| * | | | | | | | | | | | unpack-trees: fix "read-tree -u --reset A B" with conflicted indexJeff King2013-11-041-8/+17
* | | | | | | | | | | | | Merge branch 'jc/ref-excludes'Junio C Hamano2013-12-056-2/+155
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | rev-parse: introduce --exclude=<glob> to tame wildcardsjc/ref-excludesJunio C Hamano2013-11-013-0/+43
| * | | | | | | | | | | | | rev-list --exclude: export add/clear-ref-exclusion and ref-excluded APIJunio C Hamano2013-11-012-23/+28