summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2011-05-04Merge branch 'mg/sha1-path-advise' into maintLibravatar Junio C Hamano2-9/+19
2011-05-04git-add.txt: document 'add.ignoreErrors'Libravatar Valentin Haenel1-0/+2
2011-05-01Pass empty file to p4merge where no base is suitable.Libravatar Ciaran Jessup1-6/+3
2011-05-01Look for password in both CVS and CVSNT password files.Libravatar Guy Rouillier1-12/+41
2011-04-29merge-one-file: fix broken merges with alternate work treesLibravatar Jeff King2-3/+8
2011-04-29add tests for merge-index / merge-one-fileLibravatar Jeff King1-0/+100
2011-04-29"add -p": work-around an old laziness that does not coalesce hunksLibravatar Junio C Hamano2-4/+7
2011-04-29add--interactive.perl: factor out repeated --recount optionLibravatar Junio C Hamano1-8/+8
2011-04-29t3701: Editing a split hunk in an "add -p" sessionLibravatar Junio C Hamano1-0/+36
2011-04-29add -p: 'q' should really quitLibravatar Junio C Hamano1-5/+4
2011-04-29Start 1.7.5.1 maintenance trackLibravatar Junio C Hamano2-1/+15
2011-04-29Merge branch 'mg/x-years-12-months' into maintLibravatar Junio C Hamano2-2/+4
2011-04-29git-send-email: fix missing space in error messageLibravatar Sylvain Rabot1-1/+1
2011-04-29blame: tolerate bogus e-mail addresses a bit betterLibravatar Josh Stone3-3/+13
2011-04-28git-rebase--interactive.sh: preserve-merges fails on merges created with no-ffLibravatar Andrew Wong2-2/+32
2011-04-26pretty: quote rfc822 specials in email addressesLibravatar Jeff King2-1/+102
2011-04-26git-svn.txt: small typeface improvementsLibravatar Valentin Haenel1-4/+4
2011-04-26git-svn.txt: move option descriptionsLibravatar Valentin Haenel1-11/+11
2011-04-26git-svn.txt: fix usage of --add-author-fromLibravatar Valentin Haenel1-1/+1
2011-04-26http: clear POSTFIELDS when initializing a slotLibravatar Junio C Hamano1-0/+1
2011-04-23Git 1.7.5Libravatar Junio C Hamano2-1/+6
2011-04-23Fix "add -u" that sometimes fails to resolve unmerged pathsLibravatar Junio C Hamano2-39/+30
2011-04-23diff-files: show unmerged entries correctlyLibravatar Junio C Hamano2-2/+95
2011-04-23diff: remove often unused parameters from diff_unmerge()Libravatar Junio C Hamano3-11/+6
2011-04-23diff.c: return filepair from diff_unmerge()Libravatar Junio C Hamano2-6/+9
2011-04-23test: use $_z40 from test-libLibravatar Junio C Hamano12-22/+15
2011-04-20date: avoid "X years, 12 months" in relative datesLibravatar Michael J Gruber2-2/+4
2011-04-19Git 1.7.5-rc3Libravatar Junio C Hamano3-9/+4
2011-04-19Sync with 1.7.4.5Libravatar Junio C Hamano2-0/+11
2011-04-19Git 1.7.4.5Libravatar Junio C Hamano3-2/+6
2011-04-19git-svn.txt: Document --mergeinfoLibravatar Michael J Gruber1-0/+7
2011-04-18Revert "run-command: prettify -D_FORTIFY_SOURCE workaround"Libravatar Junio C Hamano1-11/+6
2011-04-15doc: Clarify that "cherry-pick -x" does not use "git notes"Libravatar Sebastian Schuberth1-3/+4
2011-04-15Documentation: describe the format of messages with inline patchesLibravatar Jonathan Nieder1-0/+58
2011-04-15Restructure documentation for git-merge-base.Libravatar Jonathan Nieder1-12/+16
2011-04-15Documentation: update to git-merge-base --octopusLibravatar Vincent van Ravesteijn2-2/+7
2011-04-14Merge branch 'maint'Libravatar Junio C Hamano4-3/+7
2011-04-14archive: document limitation of tar.umask config settingLibravatar René Scharfe1-1/+2
2011-04-14t3306,t5304: avoid clock skew issuesLibravatar Michael J Gruber2-1/+5
2011-04-14git.txt: fix list continuationLibravatar Michael J Gruber1-1/+0
2011-04-13Git 1.7.5-rc2Libravatar Junio C Hamano2-3/+3
2011-04-13Merge branch 'maint'Libravatar Junio C Hamano0-0/+0
2011-04-13Merge branch 'jc/rev-list-options-fix' into maintLibravatar Junio C Hamano1-2/+2
2011-04-13Merge branch 'js/checkout-untracked-symlink' into maintLibravatar Junio C Hamano1-1/+1
2011-04-13mergetool: Teach about submodulesLibravatar Jonathon Mah2-9/+371
2011-04-13remove doubled words, e.g., s/to to/to/, and fix related typosLibravatar Jim Meyering8-14/+11
2011-04-13revert: Hide '-r' option in default usageLibravatar Ramkumar Ramachandra1-1/+2
2011-04-12format-patch: document --quiet optionLibravatar Carlos Martín Nieto1-1/+4
2011-04-12format-patch: don't pass on the --quiet flagLibravatar Carlos Martín Nieto1-6/+10
2011-04-12--dirstat: In case of renames, use target filename instead of source filenameLibravatar Johan Herland1-1/+1