summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* log --use-mailmap: optimize for cases without --author/--committer searchJunio C Hamano2013-01-101-1/+1
* log: add log.mailmap configuration optionAntoine Pelisse2013-01-103-0/+35
* log: grep author/committer using mailmapAntoine Pelisse2013-01-102-0/+72
* test: add test for --use-mailmap optionAntoine Pelisse2013-01-101-0/+14
* log: add --use-mailmap optionAntoine Pelisse2013-01-102-1/+13
* pretty: use mailmap to display username and emailAntoine Pelisse2013-01-101-21/+37
* mailmap: add mailmap structure to rev_info and ppAntoine Pelisse2013-01-103-0/+3
* mailmap: simplify map_user() interfaceAntoine Pelisse2013-01-105-144/+126
* mailmap: remove email copy and length limitationJunio C Hamano2013-01-101-16/+59
* Use split_ident_line to parse author and committerAntoine Pelisse2013-01-073-78/+52
* string-list: allow case-insensitive string listJunio C Hamano2013-01-072-4/+17
* Sync with 1.8.0.2Junio C Hamano2012-12-102-4/+4
|\
| * Git 1.8.0.2v1.8.0.2Junio C Hamano2012-12-102-2/+3
| * Documentation/git-stash.txt: add a missing verbSébastien Loriot2012-12-101-1/+1
| * git(1): remove a defunct link to "list of authors"Junio C Hamano2012-12-091-2/+1
* | Makefile: whitespace style fixes in macro definitionsStefano Lattarini2012-12-103-30/+30
* | Git 1.8.1-rc1v1.8.1-rc1Junio C Hamano2012-12-072-23/+5
* | Documentation/diff-config: work around AsciiDoc misfortuneJunio C Hamano2012-12-071-2/+2
* | Merge branch 'maint'Junio C Hamano2012-12-071-0/+19
|\ \ | |/
| * Update draft release notes to 1.8.0.2Junio C Hamano2012-12-071-0/+19
| * Merge branch 'jc/doc-push-satellite' into maintJunio C Hamano2012-12-071-2/+14
| |\
| * \ Merge branch 'jc/same-encoding' into maintJunio C Hamano2012-12-076-4/+13
| |\ \
| * \ \ Merge branch 'lt/diff-stat-show-0-lines' into maintJunio C Hamano2012-12-074-58/+110
| |\ \ \
* | \ \ \ Merge branch 'master' of git://github.com/git-l10n/git-poJunio C Hamano2012-12-074-804/+4417
|\ \ \ \ \
| * \ \ \ \ Merge branch git://github.com/ralfth/git-po-deJiang Xin2012-12-071-754/+4305
| |\ \ \ \ \
| | * | | | | l10n: de.po: translate 22 new messagesRalf Thielow2012-12-061-853/+943
| | * | | | | l10n: de.po: translate 825 new messagesRalf Thielow2012-12-061-494/+3955
| * | | | | | l10n: Update Swedish translation (1979t0f0u)Peter Krefting2012-11-301-16/+37
| |/ / / / /
| * | | | | l10n: vi.po: update to git-v1.8.0.1-347-gf94c3Tran Ngoc Quan2012-11-301-20/+43
| * | | | | l10n: Update git.pot (5 new, 1 removed messages)Jiang Xin2012-11-301-14/+32
* | | | | | Merge branch 'rr/t4041-cleanup'Junio C Hamano2012-12-071-249/+248
|\ \ \ \ \ \
| * | | | | | t4041 (diff-submodule-option): modernize styleRamkumar Ramachandra2012-12-021-230/+229
| * | | | | | t4041 (diff-submodule-option): rewrite add_file() routineRamkumar Ramachandra2012-12-021-12/+12
| * | | | | | t4041 (diff-submodule-option): parse digests sensiblyRamkumar Ramachandra2012-12-021-7/+7
| * | | | | | t4041 (diff-submodule-option): don't hardcode SHA-1 in expected outputsRamkumar Ramachandra2012-11-271-5/+5
* | | | | | | 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