summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Which merge_file() function do you mean?Junio C Hamano2012-12-097-17/+18
* Merge branch 'mm/status-push-pull-advise'Junio C Hamano2012-12-041-2/+3
|\
| * document that statusHints affects git checkoutMatthieu Moy2012-12-041-2/+3
* | Git 1.8.1-rc0v1.8.1-rc0Junio C Hamano2012-12-032-12/+14
* | Merge branch 'mm/status-push-pull-advise'Junio C Hamano2012-12-031-6/+9
|\ \ | |/
| * status: respect advice.statusHints for ahead/behind adviceJeff King2012-12-031-6/+9
* | Update draft release notes to 1.8.1Junio C Hamano2012-11-291-1/+32
* | Merge branch 'pw/p4-various-fixes'Junio C Hamano2012-11-293-20/+137
|\ \
| * | git p4: remove unneeded cmd initializationPete Wyckoff2012-11-261-1/+0
| * | git p4: fix labelDetails typo in exceptionPete Wyckoff2012-11-261-1/+1
| * | git p4 test: display unresolvable host errorPete Wyckoff2012-11-261-0/+12
| * | git p4: catch p4 errors when streaming file contentsPete Wyckoff2012-11-262-8/+43
| * | git p4: handle servers without move supportPete Wyckoff2012-11-262-1/+55
| * | git p4: catch p4 describe errorsPete Wyckoff2012-11-261-9/+26
* | | Merge branch 'lt/diff-stat-show-0-lines'Junio C Hamano2012-11-292-28/+74
|\ \ \
| * | | t4049: refocus testsJunio C Hamano2012-11-291-11/+9
| * | | diff --shortstat: do not count "unmerged" entriesJunio C Hamano2012-11-271-3/+2
| * | | diff --stat: do not count "unmerged" entriesJunio C Hamano2012-11-272-3/+5
| * | | diff --stat: move the "total count" logic to the last loopJunio C Hamano2012-11-272-10/+13
| * | | diff --stat: use "file" temporary variable to refer to data->files[i]Junio C Hamano2012-11-271-13/+13
| * | | diff --stat: status of unmodified pair in diff-q is not zeroJunio C Hamano2012-11-271-1/+1
| * | | test: add failing tests for "diff --stat" to t4049Junio C Hamano2012-11-271-1/+45
* | | | Merge branch 'fc/remote-hg'Junio C Hamano2012-11-296-1/+1639
|\ \ \ \
| * | | | remote-hg: fix for older versions of pythonFelipe Contreras2012-11-271-4/+8
| * | | | remote-hg: fix for files with spacesFelipe Contreras2012-11-271-1/+1
| * | | | remote-hg: avoid bad refsFelipe Contreras2012-11-121-0/+3
| * | | | remote-hg: try the 'tip' if no checkout presentFelipe Contreras2012-11-121-0/+2
| * | | | remote-hg: fix compatibility with older versions of hgFelipe Contreras2012-11-121-1/+1
| * | | | remote-hg: add missing config for basic testsRamkumar Ramachandra2012-11-121-0/+9
| * | | | remote-hg: the author email can be nullFelipe Contreras2012-11-041-3/+3
| * | | | remote-hg: add option to not track branchesFelipe Contreras2012-11-041-8/+14
| * | | | remote-hg: add extra author testFelipe Contreras2012-11-041-1/+5
| * | | | remote-hg: add tests to compare with hg-gitFelipe Contreras2012-11-041-0/+462
| * | | | remote-hg: add bidirectional testsFelipe Contreras2012-11-041-0/+243
| * | | | test-lib: avoid full path to store test resultsFelipe Contreras2012-11-041-1/+2
| * | | | remote-hg: add basic testsFelipe Contreras2012-11-042-0/+125
| * | | | remote-hg: fake bookmark when there's noneFelipe Contreras2012-11-041-5/+14
| * | | | remote-hg: add compat for hg-git author fixesFelipe Contreras2012-11-041-6/+53
| * | | | remote-hg: add support for hg-git compat modeFelipe Contreras2012-11-041-6/+83
| * | | | remote-hg: match hg merge behaviorFelipe Contreras2012-11-041-0/+17
| * | | | remote-hg: make sure the encoding is correctFelipe Contreras2012-11-041-1/+11
| * | | | remote-hg: add support to push URLsFelipe Contreras2012-11-041-2/+12
| * | | | remote-hg: add support for remote pushingFelipe Contreras2012-11-041-2/+7
| * | | | remote-hg: add support for pushingFelipe Contreras2012-11-041-2/+215
| * | | | Add new remote-hg transport helperFelipe Contreras2012-11-041-0/+391
* | | | | Merge branch 'mk/complete-tcsh'Junio C Hamano2012-11-291-7/+12
|\ \ \ \ \
| * | | | | Support for git aliasing for tcsh completionMarc Khouzam2012-11-271-7/+12
* | | | | | Merge branch 'jc/doc-push-satellite'Junio C Hamano2012-11-291-2/+14
|\ \ \ \ \ \
| * | | | | | Documentation/git-push.txt: clarify the "push from satellite" workflowJunio C Hamano2012-11-271-2/+14
* | | | | | | Merge branch 'km/send-email-remove-cruft-in-address'Junio C Hamano2012-11-291-18/+59
|\ \ \ \ \ \ \