summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2009-11-22user-manual: Document that "git merge" doesn't like uncommited changes.Libravatar Matthieu Moy1-2/+18
2009-11-22merge-recursive: point the user to commit when file would be overwritten.Libravatar Matthieu Moy4-1/+14
2009-10-10GIT 1.6.5Libravatar Junio C Hamano3-7/+6
2009-10-10git-svn: hide find_parent_branch output in double quiet modeLibravatar Simon Arlott1-7/+12
2009-10-09Documentation: clone: clarify discussion of initial branchLibravatar Jonathan Nieder1-2/+3
2009-10-09Merge branch 'rs/maint-archive-prefix'Libravatar Junio C Hamano2-3/+16
2009-10-09Merge branch 'fc/mutt-alias'Libravatar Junio C Hamano1-1/+1
2009-10-09Merge branch 'ef/msvc-noreturn'Libravatar Junio C Hamano3-9/+11
2009-10-09Merge branch 'jk/reflog-date'Libravatar Junio C Hamano3-2/+7
2009-10-09Merge branch 'ch/am-header'Libravatar Junio C Hamano1-1/+1
2009-10-09bash: add support for 'git replace'Libravatar Björn Gustavsson1-0/+6
2009-10-09completion: fix alias listings with newlinesLibravatar Stephen Boyd1-2/+6
2009-10-09completion: fix completion of git <TAB><TAB>Libravatar Stephen Boyd1-1/+1
2009-10-09import-tars: Add missing closing bracketLibravatar Ingmar Vanhassel1-1/+1
2009-10-09racy-git.txt: explain nsec problem in more detailLibravatar Jonathan Nieder1-4/+6
2009-10-09Documentation: clarify "working tree" definitionLibravatar Jonathan Nieder1-3/+3
2009-10-09Documentation: clarify branch creationLibravatar Jonathan Nieder1-8/+8
2009-10-09Documentation: branch: update --merged descriptionLibravatar Jonathan Nieder1-4/+6
2009-10-09Documentation: clarify mergeoptions descriptionLibravatar Jonathan Nieder2-3/+3
2009-10-09Documentation: git fmt-merge-msg does not have to be a scriptLibravatar Jonathan Nieder2-5/+6
2009-10-09Describe DOCBOOK_XSL_172, ASCIIDOC_NO_ROFF options in MakefileLibravatar Jonathan Nieder1-1/+5
2009-10-09pull: improve advice for unconfigured error caseLibravatar Jeff King1-4/+12
2009-10-09Merge git://git.bogomips.org/git-svnLibravatar Junio C Hamano1-2/+9
2009-10-09git-svn: Avoid spurious errors when rewriteRoot is used.Libravatar Alexander Gavrilov1-2/+9
2009-10-09Merge branch 'ms/msvc'Libravatar Junio C Hamano3-3/+3
2009-10-08Update draft release notes to 1.6.5Libravatar Junio C Hamano1-6/+10
2009-10-08Merge branch 'maint'Libravatar Junio C Hamano1-5/+2
2009-10-08Makefile: add a note about the NO_MMAP setting on IRIX and IRIX64Libravatar Brandon Casey1-0/+12
2009-10-08ls-files: die instead of fprintf/exit in -i errorLibravatar Ben Walton1-5/+2
2009-10-08Makefile: enable THREADED_DELTA_SEARCH on IRIX and IRIX64Libravatar Brandon Casey1-0/+2
2009-10-08Fix the exit code of MSVC build scripts on cygwinLibravatar Ramsay Jones2-2/+2
2009-10-08Fix MSVC build on cygwinLibravatar Ramsay Jones1-1/+1
2009-10-08Git archive and trailing "/" in prefixLibravatar René Scharfe2-3/+16
2009-10-07completion: add dirstat and friends to diff optionsLibravatar Stephen Boyd1-0/+2
2009-10-07completion: update am, commit, and logLibravatar Stephen Boyd1-2/+7
2009-10-07Makefile: enable THREADED_DELTA_SEARCH on SunOSLibravatar Brandon Casey1-0/+1
2009-10-07Merge branch 'maint'Libravatar Junio C Hamano1-3/+6
2009-10-07fast-import.c::validate_raw_date(): really validate the valueLibravatar Junio C Hamano1-3/+6
2009-10-07README: git lives at http://git-scm.com these daysLibravatar Stefan Naewe1-1/+1
2009-10-05git-pull: dead code removalLibravatar Junio C Hamano1-8/+1
2009-10-04Merge branch 'maint'Libravatar Junio C Hamano2-3/+19
2009-10-04Merge branch 'jc/maint-1.6.4-show-branch-default' into maintLibravatar Junio C Hamano2-3/+19
2009-10-04show-branch: fix segfault when showbranch.default existsLibravatar Junio C Hamano2-3/+19
2009-10-03Fix '--relative-date'Libravatar Johan Sageryd2-1/+2
2009-10-02tests: make all test files executableLibravatar Mark Rada2-0/+0
2009-10-02filter-branch: add --prune-empty to option summaryLibravatar Adam Brewster1-0/+1
2009-10-02Fix some printf format warningsLibravatar Ramsay Jones1-2/+2
2009-10-01send-email: fix mutt regex for grouped aliasesLibravatar Felipe Contreras1-1/+1
2009-10-01add NORETURN_PTR for function pointersLibravatar Erik Faye-Lund2-4/+6
2009-10-01increase portability of NORETURN declarationsLibravatar Erik Faye-Lund3-9/+9