summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2015-10-30Merge branch 'jc/add-u-A-default-to-top'Libravatar Junio C Hamano3-7/+4
2015-10-30Merge branch 'ar/clone-dissociate'Libravatar Junio C Hamano3-10/+26
2015-10-30Merge git://ozlabs.org/~paulus/gitkLibravatar Junio C Hamano13-531/+450
2015-10-30Merge https://github.com/vnwildman/gitkLibravatar Paul Mackerras1-22/+23
2015-10-30gitk: Update Russian translationLibravatar Dimitriy Ryazantcev1-239/+160
2015-10-30gitk: Add accelerator to German localeLibravatar Takashi Iwai1-18/+18
2015-10-30gitk: Add accelerators to Japanese localeLibravatar Takashi Iwai1-17/+17
2015-10-30gitk: Update msgid's for menu items with acceleratorLibravatar Takashi Iwai12-205/+205
2015-10-30gitk: l10n: Update Catalan translationLibravatar Alex Henrie1-28/+25
2015-10-30gitk: Add missing acceleratorsLibravatar Beat Bolli1-2/+2
2015-10-29Eighth batch for 2.7Libravatar Junio C Hamano1-1/+24
2015-10-29Merge branch 'jc/am-mailinfo-direct'Libravatar Junio C Hamano1-19/+23
2015-10-29Merge branch 'jc/mailinfo-lib'Libravatar Junio C Hamano4-1035/+1099
2015-10-29Merge branch 'rp/link-curl-before-ssl'Libravatar Junio C Hamano2-6/+34
2015-10-29Merge branch 'dt/name-hash-dir-entry-fix'Libravatar Junio C Hamano4-60/+35
2015-10-29Merge branch 'tk/sigchain-unnecessary-post-tempfile'Libravatar Junio C Hamano4-4/+0
2015-10-29Merge branch 'jk/war-on-sprintf'Libravatar Junio C Hamano2-1/+2
2015-10-29Merge branch 'jc/em-dash-in-doc'Libravatar Junio C Hamano6-6/+6
2015-10-29Merge branch 'jc/everyday-markup'Libravatar Junio C Hamano1-1/+1
2015-10-29Merge branch 'xf/user-manual-markup'Libravatar Junio C Hamano11-11/+11
2015-10-29difftool: ignore symbolic links in use_wt_fileLibravatar David Aguilar2-3/+20
2015-10-29merge-file: clamp exit code to maximum 127Libravatar Jeff King3-1/+38
2015-10-28rebase-i: work around Windows CRLF line endingsLibravatar Junio C Hamano2-1/+13
2015-10-28t3404: "rebase -i" gets broken when insn sheet uses CR/LF line endingsLibravatar Johannes Schindelin1-0/+12
2015-10-28add_submodule_odb: initialize alt_odb list earlierLibravatar Jeff King1-1/+1
2015-10-26Seventh batch for 2.7Libravatar Junio C Hamano1-1/+36
2015-10-26Merge branch 'dk/p4-import-ctypes'Libravatar Junio C Hamano1-0/+1
2015-10-26Merge branch 'jk/repository-extension'Libravatar Junio C Hamano8-12/+209
2015-10-26Merge branch 'dt/t7063-fix-flaky-test'Libravatar Junio C Hamano1-1/+3
2015-10-26Merge branch 'kn/for-each-tag'Libravatar Junio C Hamano1-0/+1
2015-10-26Merge branch 'es/worktree-add'Libravatar Junio C Hamano1-1/+1
2015-10-26Merge branch 'tk/stripspace'Libravatar Junio C Hamano9-103/+118
2015-10-26Merge branch 'rt/placeholder-in-usage'Libravatar Junio C Hamano2-3/+3
2015-10-26Merge branch 'jc/usage-stdin'Libravatar Junio C Hamano25-41/+64
2015-10-26Merge branch 'mr/worktree-list'Libravatar Junio C Hamano9-88/+485
2015-10-26Merge branch 'jc/am-3-fallback-regression-fix'Libravatar Junio C Hamano1-16/+33
2015-10-26merge: detect delete/modechange conflictLibravatar Jeff King3-2/+37
2015-10-26t6031: generalize for recursive and resolve strategiesLibravatar Jeff King2-56/+77
2015-10-26t6031: move triple-rename test to t3030Libravatar Jeff King2-31/+30
2015-10-26use pop_commit() for consuming the first entry of a struct commit_listLibravatar René Scharfe10-92/+31
2015-10-26Correct fscanf formatting string for I64u valuesLibravatar Waldek Maleska2-1/+5
2015-10-26Silence GCC's "cast of pointer to integer of a different size" warningLibravatar Johannes Schindelin3-4/+6
2015-10-26Squelch warning about an integer overflowLibravatar Johannes Schindelin1-1/+1
2015-10-26imap-send: only use CURLOPT_LOGIN_OPTIONS if it is actually availableLibravatar Johannes Schindelin1-0/+4
2015-10-26blame: fix option name in error messageLibravatar Max Kirillov1-1/+1
2015-10-26user-manual: fix the description of fast-forwardLibravatar Xue Fuqiao1-5/+5
2015-10-24add: simplify -u/-A without pathspecLibravatar Junio C Hamano3-7/+4
2015-10-23compat/mingw.c: remove printf format warningLibravatar Johannes Sixt1-1/+1
2015-10-23read_branches_file: plug a FILE* leakLibravatar Johannes Sixt1-0/+1
2015-10-22Documentation: AsciiDoc spells em-dash as double-dashes, not tripleLibravatar Junio C Hamano6-6/+6