summaryrefslogtreecommitdiffstats
path: root/Documentation/git-mergetool--lib.txt (unfollow)
Commit message (Expand)AuthorFilesLines
2011-08-16Sync with "maint"Junio C Hamano1-49/+1
2011-08-16Prepare for 1.7.6.1Junio C Hamano2-1/+53
2011-08-16am: refresh the index at start and --resolvedJeff King1-0/+2
2011-08-11Update draft release notes to 1.7.7Junio C Hamano1-3/+36
2011-08-08receive-pack: do not overstep command line argument arrayJunio C Hamano1-1/+1
2011-08-08filter-branch: Export variable `workdir' for --commit-filterMichael Witten1-1/+1
2011-08-08Documentation/Makefile: add *.pdf to `clean' targetEmilio G. Cota1-0/+1
2011-08-08Documentation: ignore *.pdf filesEmilio G. Cota1-0/+1
2011-08-06fast-export: quote paths in outputJeff King2-8/+51
2011-08-05docs: put listed example commands in backticksJeff King13-66/+66
2011-08-04gitweb: pass string after encoding in utf-8 to syntax highlighter张忠山1-1/+1
2011-08-04Add option hooks.diffopts to customize change summary in post-receive-emailJon Jensen1-1/+8
2011-08-04diff -c/--cc: do not mistake "resolved as deletion" as "use working tree"Junio C Hamano1-4/+10
2011-08-03add gitignore entry to description about how to write a builtinHeiko Voigt1-0/+2
2011-08-03Makefile: some changes for http-related flag documentationTay Ray Chuan1-3/+3
2011-08-03http.c: fix an invalid free()Tay Ray Chuan1-6/+2
2011-08-03gitattributes: Reword "attribute macro" to "macro attribute"Michael Haggerty1-9/+9
2011-08-03gitattributes: Clarify discussion of attribute macrosMichael Haggerty1-5/+8
2011-08-03Skip archive --remote tests on WindowsJohannes Sixt1-4/+4
2011-08-02commit: allow partial commits with relative pathsClemens Buchacher4-38/+39
2011-08-02notice error exit from pagerClemens Buchacher1-9/+6
2011-08-02grep: long context optionsRené Scharfe2-13/+21
2011-08-02grep: add option to show whole function as contextRené Scharfe5-11/+47
2011-08-02pull: remove extra space from reflog messageOri Avtalion1-1/+1
2011-08-02Documentation/submodule: add command references and update optionsJens Lehmann1-12/+26
2011-08-01reflog: actually default to subcommand 'show'Michael Schubert1-2/+1
2011-08-01connect: only log if all attempts failed (ipv4)Erik Faye-Lund1-13/+10
2011-08-01connect: correctly number ipv6 network adapterErik Faye-Lund1-1/+1
2011-08-01git-p4: commit time should be most recent p4 change timePete Wyckoff2-1/+33
2011-08-01git-p4: one test missing config git-p4.skipSubmitEditCheckPete Wyckoff1-0/+1
2011-08-01git-p4: add missing && in testPete Wyckoff1-1/+1
2011-08-01git-p4: use test_when_finished in testsPete Wyckoff1-54/+49
2011-08-01propagate --quiet to send-pack/receive-packClemens Buchacher6-9/+38
2011-08-01Break down no-lstat() condition checks in verify_uptodate()Nguyễn Thái Ngọc Duy1-2/+13
2011-08-01t7400: fix bogus test failure with symlinked trashJeff King1-2/+4
2011-08-01gitweb: Git config keys are case insensitive, make config search tooJakub Narebski1-0/+7
2011-08-01error_routine: use parent's stderr if exec failsClemens Buchacher3-8/+27
2011-08-01Documentation: clarify the invalidated tree entry formatCarlos Martín Nieto1-2/+3
2011-07-28submodule: update and add must honor --quiet flagJens Lehmann2-4/+11
2011-07-25Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails.Jon Seymour2-4/+2
2011-07-25gitweb: Introduce common system-wide settings for convenienceJakub Narebski4-7/+53
2011-07-24tests: print failed test numbers at the end of the test runJens Lehmann1-1/+13