summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ap/log-mailmap'Junio C Hamano2013-01-2015-229/+393
|\
| * 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
* | Merge git://bogomips.org/git-svnJunio C Hamano2013-01-184-5/+23
|\ \
| * | git-svn: teach find-rev to find near matchesJohn Keeping2013-01-172-2/+20
| * | git svn: do not overescape URLs (fallback case)Jonathan Nieder2013-01-171-1/+1
| * | Git::SVN::Editor::T: pass $deletions to ->A and ->DJonathan Nieder2013-01-171-2/+2
* | | Update draft release notes to 1.8.2Junio C Hamano2013-01-181-0/+8
* | | Merge branch 'ss/help-htmlpath-config-doc'Junio C Hamano2013-01-181-0/+6
|\ \ \
| * | | config.txt: Document help.htmlpath config parameterSebastian Staudt2013-01-151-0/+6
* | | | Merge branch 'nd/fix-perf-parameters-in-tests'Junio C Hamano2013-01-181-1/+1
|\ \ \ \
| * | | | test-lib.sh: unfilter GIT_PERF_*Nguyễn Thái Ngọc Duy2013-01-151-1/+1
* | | | | Merge branch 'nd/attr-debug-fix'Junio C Hamano2013-01-181-1/+1
|\ \ \ \ \
| * | | | | attr: make it build with DEBUG_ATTR againNguyễn Thái Ngọc Duy2013-01-151-1/+1
* | | | | | Merge branch 'rs/pretty-use-prefixcmp'Junio C Hamano2013-01-181-4/+4
|\ \ \ \ \ \
| * | | | | | pretty: use prefixcmp instead of memcmp on NUL-terminated stringsRené Scharfe2013-01-141-4/+4
* | | | | | | Merge branch 'ds/completion-silence-in-tree-path-probe'Junio C Hamano2013-01-181-1/+1
|\ \ \ \ \ \ \
| * | | | | | | git-completion.bash: silence "not a valid object" errorsDylan Smith2013-01-111-1/+1
* | | | | | | | Merge branch 'jn/maint-trim-vim-contrib'Junio C Hamano2013-01-181-13/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | contrib/vim: simplify instructions for old vim supportJonathan Nieder2013-01-101-13/+3
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'pe/doc-email-env-is-trumped-by-config'Junio C Hamano2013-01-181-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | git-commit-tree(1): correct description of defaultsPeter Eisentraut2013-01-101-2/+2
| |/ / / / / / /
* | | | | | | | Merge branch 'mk/complete-tcsh'Junio C Hamano2013-01-181-12/+21
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Prevent space after directories in tcsh completionMarc Khouzam2013-01-071-12/+21
* | | | | | | | Sync with 1.8.1.1Junio C Hamano2013-01-142-1/+53
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Git 1.8.1.1v1.8.1.1Junio C Hamano2013-01-143-2/+54
| * | | | | | | Merge branch 'jk/complete-commit-c' into maintJunio C Hamano2013-01-141-0/+7
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/unify-exit-code-by-receiving-signal' into maintJunio C Hamano2013-01-144-7/+5
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jn/xml-depends-on-asciidoc-conf' into maintJunio C Hamano2013-01-141-5/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-fast-import-doc-reorder' into maintJunio C Hamano2013-01-141-46/+52
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/shortlog-no-wrap-doc' into maintJunio C Hamano2013-01-141-0/+3
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-fast-import-doc-dedup-done' into maintJunio C Hamano2013-01-141-5/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/comment-cygwin-win32api-in-makefile' into maintJunio C Hamano2013-01-141-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/leave-base-name-in-name-field-of-tar' into maintJunio C Hamano2013-01-141-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jl/interrupt-clone-remove-separate-git-dir' into maintJunio C Hamano2013-01-142-2/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit' into maintJunio C Hamano2013-01-143-8/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/apply-trailing-blank-removal' into maintJunio C Hamano2013-01-141-6/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pf/editor-ignore-sigint' into maintJunio C Hamano2013-01-142-7/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mk/maint-graph-infinity-loop' into maintJunio C Hamano2013-01-143-6/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.8.2Junio C Hamano2013-01-141-0/+12
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/blame-no-follow'Junio C Hamano2013-01-142-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status