summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2013-10-14Merge branch 'po/remote-set-head-usage'Libravatar Jonathan Nieder2-5/+5
2013-10-14Merge branch 'nd/clone-local-with-colon'Libravatar Jonathan Nieder2-2/+46
2013-10-14Merge branch 'jx/clean-interactive'Libravatar Jonathan Nieder2-3/+3
2013-10-14Merge branch 'jk/diff-algo'Libravatar Jonathan Nieder1-2/+2
2013-10-14git-prompt.sh: optionally show upstream branch nameLibravatar Julien Carsique1-1/+6
2013-10-14path-utils test: rename mingw_path function to print_pathLibravatar Sebastian Schuberth2-3/+3
2013-10-14howto/revert-a-faulty-merge: fix unescaped '^'sLibravatar Ramsay Jones1-4/+4
2013-10-14howto/setup-git-server-over-http: fix unescaped '^'sLibravatar Ramsay Jones1-2/+2
2013-10-13mergetools/diffmerge: support DiffMerge as a git mergetoolLibravatar Stefan Saasen3-2/+18
2013-10-13.mailmap: switch to Thomas Rast's personal addressLibravatar Thomas Rast1-1/+3
2013-10-12git-svn: Warn about changing default for --prefix in Git v2.0Libravatar Johan Herland3-2/+88
2013-10-12Documentation/git-svn: Promote the use of --prefix in docs + examplesLibravatar Johan Herland1-10/+25
2013-10-11status: show commit sha1 in "You are currently cherry-picking" messageLibravatar Ralf Thielow3-6/+12
2013-10-11status test: add missing && to <<EOF blocksLibravatar Jonathan Nieder1-5/+5
2013-10-10cherry-pick: handle "-" after parsing optionsLibravatar Jeff King2-2/+14
2013-10-10git-svn.txt: elaborate on rev_map filesLibravatar Keshav Kini1-4/+24
2013-10-10git-svn.txt: replace .git with $GIT_DIRLibravatar Keshav Kini1-8/+8
2013-10-10git-svn.txt: reword description of gc commandLibravatar Keshav Kini1-2/+2
2013-10-10git-svn.txt: fix AsciiDoc formatting errorLibravatar Keshav Kini1-1/+1
2013-10-10git-svn: fix signed commit parsingLibravatar Nicolas Vigier1-1/+1
2013-10-09checkout test: enable test with complex relative pathLibravatar Stefan Beller1-7/+7
2013-10-08Merge branch 'tz/credential-netrc'Libravatar Jonathan Nieder1-1/+3
2013-10-08git-credential-netrc: fix uninitialized warningLibravatar Ted Zlatanov1-1/+3
2013-10-03Documentation/Makefile: make AsciiDoc dblatex dir configurableLibravatar John Keeping1-1/+2
2013-09-30rebase -i: respect core.abbrevLibravatar Kirill A. Shutemov1-1/+1
2013-09-27RelNotes/1.8.5: direct script writers to "git status --porcelain"Libravatar Matthieu Moy1-0/+3
2013-09-27remote set-head -h: add long options to synopsisLibravatar Philip Oakley1-2/+2
2013-09-27remote doc: document long forms of set-head optionsLibravatar Philip Oakley1-3/+3
2013-09-27clone: tighten "local paths with colons" check a bitLibravatar Nguyễn Thái Ngọc Duy2-2/+46
2013-09-26contrib: remove ciabotLibravatar Stefan Beller4-553/+0
2013-09-26Sync with Git 1.8.4.1Libravatar Jonathan Nieder2-14/+36
2013-09-26Git 1.8.4.1Libravatar Jonathan Nieder3-15/+37
2013-09-26merge-recursive: fix parsing of "diff-algorithm" optionLibravatar John Keeping1-2/+2
2013-09-26Merge branch 'mm/rebase-continue-freebsd-WB' into maintLibravatar Jonathan Nieder1-1/+10
2013-09-26Merge branch 'km/svn-1.8-serf-only' into maintLibravatar Jonathan Nieder2-3/+34
2013-09-26Merge branch 'js/xread-in-full' into maintLibravatar Jonathan Nieder1-1/+1
2013-09-26Merge branch 'bc/send-email-ssl-die-message-fix' into maintLibravatar Jonathan Nieder1-1/+1
2013-09-24Merge branch 'bc/submodule-status-ignored'Libravatar Jonathan Nieder7-11/+55
2013-09-24Merge branch 'cc/replace-with-the-same-type'Libravatar Jonathan Nieder3-9/+61
2013-09-24Merge branch 'kb/msvc-compile'Libravatar Jonathan Nieder7-23/+32
2013-09-24Merge branch 'nd/unpack-entry-optim-in-pack-objects'Libravatar Jonathan Nieder1-10/+10
2013-09-24Merge branch 'jk/shortlog-tolerate-broken-commit'Libravatar Jonathan Nieder2-2/+20
2013-09-24Merge branch 'jc/strcasecmp-pure-inline'Libravatar Jonathan Nieder1-2/+16
2013-09-24Merge branch 'sg/complete-untracked-filter'Libravatar Jonathan Nieder1-2/+2
2013-09-24Merge branch 'nd/fetch-pack-error-reporting-fix'Libravatar Jonathan Nieder1-5/+5
2013-09-24Merge branch 'es/contacts-in-subdir'Libravatar Jonathan Nieder1-0/+4
2013-09-24Merge branch 'jc/push-cas'Libravatar Jonathan Nieder1-1/+1
2013-09-24Merge branch 'maint'Libravatar Jonathan Nieder2-2/+35
2013-09-24doc: don't claim that cherry calls patch-idLibravatar Michael S. Tsirkin1-2/+1
2013-09-24git-remote-mediawiki: bugfix for pages w/ >500 revisionsLibravatar Benoit Person2-2/+35