summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | git add: avoid "-u/-A without pathspec" warning on stat-dirty pathsJunio C Hamano2013-04-261-0/+2
* | | | | | Sync with 1.8.2.2Junio C Hamano2013-04-267-20/+54
|\ \ \ \ \ \
| * | | | | | Git 1.8.2.2v1.8.2.2Junio C Hamano2013-04-263-2/+21
| * | | | | | Merge branch 'jk/a-thread-only-dies-once' into maintJunio C Hamano2013-04-263-6/+26
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jn/gitweb-install-doc' into maintJunio C Hamano2013-04-262-8/+12
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'fc/untracked-zsh-prompt' into maintJunio C Hamano2013-04-261-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/receive-pack-deadlocks-with-early-failure' into maintJunio C Hamano2013-04-261-1/+4
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/chopped-ident' into maintJunio C Hamano2013-04-265-99/+75
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'rt/commentchar-fmt-merge-msg' into maintJunio C Hamano2013-04-262-7/+29
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/empty-archive' into maintJunio C Hamano2013-04-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pe/pull-rebase-v-q' into maintJunio C Hamano2013-04-262-1/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | t7409: do not use export X=YTorsten Bögershausen2013-04-261-4/+10
| * | | | | | | | | | | | | | test-hg-hg-git.sh: do not use export X=YTorsten Bögershausen2013-04-261-4/+6
| * | | | | | | | | | | | | | test-hg-bidi.sh: do not use export X=YTorsten Bögershausen2013-04-261-5/+6
| * | | | | | | | | | | | | | t9501: do not use export X=YTorsten Bögershausen2013-04-261-5/+10
| * | | | | | | | | | | | | | t9020: do not use export X=YTorsten Bögershausen2013-04-261-1/+2
* | | | | | | | | | | | | | | Merge branch 'jk/remote-helper-with-signed-tags'Junio C Hamano2013-04-247-6/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | transport-helper: add 'signed-tags' capabilityJohn Keeping2013-04-154-2/+21
| * | | | | | | | | | | | | | | transport-helper: pass --signed-tags=warn-strip to fast-exportJohn Keeping2013-04-152-1/+12
| * | | | | | | | | | | | | | | fast-export: add --signed-tags=warn-strip modeJohn Keeping2013-04-153-5/+19
* | | | | | | | | | | | | | | | Sync with maintJunio C Hamano2013-04-243-9/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Update draft release notes to 1.8.2.2Junio C Hamano2013-04-241-0/+18
| * | | | | | | | | | | | | | | Merge branch 'jk/diff-algo-finishing-touches' into maintJunio C Hamano2013-04-242-2/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sr/log-SG-no-textconv' into maintJunio C Hamano2013-04-242-72/+86
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/merge-tag-object' into maintJunio C Hamano2013-04-242-32/+81
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | completion: remove duplicate block for "git commit -c"Mårten Kongstad2013-04-241-7/+0
| * | | | | | | | | | | | | | | | | | cherry-pick/revert: make usage say '<commit-ish>...'Kevin Bracey2013-04-241-2/+2
* | | | | | | | | | | | | | | | | | | Merge git://github.com/git-l10n/git-poJunio C Hamano2013-04-235-4102/+5212
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | l10n: de.po: translate 54 new messagesRalf Thielow2013-04-201-828/+1062
| * | | | | | | | | | | | | | | | | | | l10n: zh_CN.po: translate 54 messages (2048t0f0u)Jiang Xin2013-04-121-822/+1045
| * | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'sv-nafmo/master'Jiang Xin2013-04-121-822/+1047
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | l10n: Update Swedish translation (2048t0f0u)Peter Krefting2013-04-111-822/+1047
| * | | | | | | | | | | | | | | | | | | | l10n: vi.po: Update translation (2048t0u0f)Tran Ngoc Quan2013-04-111-825/+1059
| |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | l10n: git.pot: v1.8.3 round 1 (54 new, 15 removed)Jiang Xin2013-04-101-805/+999
* | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.8.3Junio C Hamano2013-04-231-0/+19
* | | | | | | | | | | | | | | | | | | | Merge branch 'nd/pretty-formats'Junio C Hamano2013-04-2314-125/+648
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | pretty: support %>> that steal trailing spacesNguyễn Thái Ngọc Duy2013-04-185-2/+54
| * | | | | | | | | | | | | | | | | | | | pretty: support truncating in %>, %< and %><Nguyễn Thái Ngọc Duy2013-04-185-5/+140
| * | | | | | | | | | | | | | | | | | | | pretty: support padding placeholders, %< %> and %><Nguyễn Thái Ngọc Duy2013-04-183-1/+246
| * | | | | | | | | | | | | | | | | | | | pretty: add %C(auto) for auto-coloringNguyễn Thái Ngọc Duy2013-04-182-4/+25
| * | | | | | | | | | | | | | | | | | | | pretty: split color parsing into a separate functionNguyễn Thái Ngọc Duy2013-04-181-32/+39
| * | | | | | | | | | | | | | | | | | | | pretty: two phase conversion for non utf-8 commitsNguyễn Thái Ngọc Duy2013-04-182-8/+28
| * | | | | | | | | | | | | | | | | | | | utf8.c: add reencode_string_len() that can handle NULs in stringNguyễn Thái Ngọc Duy2013-04-183-7/+24
| * | | | | | | | | | | | | | | | | | | | utf8.c: add utf8_strnwidth() with the ability to skip ansi sequencesNguyễn Thái Ngọc Duy2013-04-182-6/+15
| * | | | | | | | | | | | | | | | | | | | utf8.c: move display_mode_esc_sequence_len() for use by other functionsNguyễn Thái Ngọc Duy2013-04-181-14/+14
| * | | | | | | | | | | | | | | | | | | | pretty: share code between format_decoration and show_decorationsNguyễn Thái Ngọc Duy2013-04-184-38/+39
| * | | | | | | | | | | | | | | | | | | | pretty-formats.txt: wrap long linesNguyễn Thái Ngọc Duy2013-04-181-6/+12
| * | | | | | | | | | | | | | | | | | | | pretty: get the correct encoding for --pretty:format=%eNguyễn Thái Ngọc Duy2013-04-181-6/+7
| * | | | | | | | | | | | | | | | | | | | pretty: save commit encoding from logmsg_reencode if the caller needs itNguyễn Thái Ngọc Duy2013-04-185-7/+16
* | | | | | | | | | | | | | | | | | | | | Merge branch 'kb/status-ignored-optim-2'Junio C Hamano2013-04-2312-364/+455
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \