summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
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
2015-10-22clone: allow "--dissociate" without referenceLibravatar Alex Riesen3-10/+26
2015-10-22shallow: remove unused #include "sigchain.h"Libravatar Tobias Klauser1-1/+0
2015-10-22read-cache: remove unused #include "sigchain.h"Libravatar Tobias Klauser1-1/+0
2015-10-22diff: remove unused #include "sigchain.h"Libravatar Tobias Klauser1-1/+0
2015-10-22credential-cache--daemon: remove unused #include "sigchain.h"Libravatar Tobias Klauser1-1/+0
2015-10-22Documentation: match undefline with the text in old release notesLibravatar Junio C Hamano5-5/+5
2015-10-22Documentation: match underline with the textLibravatar Junio C Hamano5-5/+5
2015-10-22Documentation/everyday: match undefline with the textLibravatar Junio C Hamano1-1/+1
2015-10-22Documentation: fix header markupLibravatar Xue Fuqiao1-1/+1
2015-10-21mailinfo: remove calls to exit() and die() deep in the callchainLibravatar Junio C Hamano2-8/+23
2015-10-21am: make direct call to mailinfoLibravatar Junio C Hamano1-19/+23
2015-10-21mailinfo: handle charset conversion errors in the callerLibravatar Junio C Hamano1-8/+11
2015-10-21mailinfo: libifyLibravatar Junio C Hamano4-1048/+1062
2015-10-21mailinfo: keep the parsed log message in a strbufLibravatar Junio C Hamano1-12/+16
2015-10-21mailinfo: handle_commit_msg() shouldn't be called after finding patchbreakLibravatar Junio C Hamano1-2/+1
2015-10-21mailinfo: move content/content_top to struct mailinfoLibravatar Junio C Hamano1-20/+26
2015-10-21mailinfo: move [ps]_hdr_data to struct mailinfoLibravatar Junio C Hamano1-14/+23
2015-10-21mailinfo: move cmitmsg and patchfile to struct mailinfoLibravatar Junio C Hamano1-16/+16
2015-10-21mailinfo: move charset to struct mailinfoLibravatar Junio C Hamano1-7/+8