summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-send-email: allow edit invalid email addressKrzysztof Mazur2012-11-261-3/+6
| * | | | | | | | | | | git-send-email: ask what to do with an invalid email addressKrzysztof Mazur2012-11-261-2/+10
| * | | | | | | | | | | git-send-email: remove invalid addresses earlierKrzysztof Mazur2012-11-261-13/+39
| * | | | | | | | | | | git-send-email: fix fallback code in extract_valid_address()Krzysztof Mazur2012-11-261-5/+5
| * | | | | | | | | | | git-send-email: remove garbage after email addressKrzysztof Mazur2012-11-261-0/+4
* | | | | | | | | | | | Merge branch 'jk/send-email-sender-prompt'Junio C Hamano2012-11-299-26/+169
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t9001: check send-email behavior with implicit senderJeff King2012-11-281-0/+28
| * | | | | | | | | | | | Merge branch 'fc/send-email-no-sender-prompt' into jk/send-email-sender-promptJunio C Hamano2012-11-282-9/+3
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t: add tests for "git var"Jeff King2012-11-281-0/+49
| * | | | | | | | | | | | | ident: keep separate "explicit" flags for author and committerJeff King2012-11-153-10/+29
| * | | | | | | | | | | | | ident: make user_ident_explicitly_given staticJeff King2012-11-152-5/+5
| * | | | | | | | | | | | | t7502: factor out autoident prerequisiteJeff King2012-11-152-11/+7
| * | | | | | | | | | | | | test-lib: allow negation of prerequisitesJeff King2012-11-152-1/+52
* | | | | | | | | | | | | | Merge branch 'fc/send-email-no-sender-prompt'Junio C Hamano2012-11-292-9/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | send-email: avoid questions when user has an identFelipe Contreras2012-11-262-9/+3
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'er/doc-add-new-commands'Junio C Hamano2012-11-291-0/+99
|\ \ \ \ \ \ \ \ \ \ \ \ \