summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2009-12-03Merge branch 'rj/maint-t9700' into maintLibravatar Junio C Hamano1-1/+1
2009-12-03Merge branch 'ls/maint-mailinfo-no-inbody' into maintLibravatar Junio C Hamano16-5/+122
2009-12-03Merge branch 'mo/maint-crlf-doc' into maintLibravatar Junio C Hamano1-3/+4
2009-12-03Merge branch 'th/remote-usage' into maintLibravatar Junio C Hamano2-21/+52
2009-12-03Merge branch 'pb/maint-use-custom-perl' into maintLibravatar Junio C Hamano4-4/+5
2009-12-03Merge branch 'mm/config-pathname-tilde-expand' into maintLibravatar Junio C Hamano5-37/+69
2009-12-03Merge branch 'bc/grep-i-F' into maintLibravatar Junio C Hamano4-6/+27
2009-12-03Merge branch 'jk/maint-break-rename-reduce-memory' into maintLibravatar Junio C Hamano2-3/+10
2009-12-03Merge branch 'rj/maint-simplify-cygwin-makefile' into maintLibravatar Junio C Hamano1-4/+2
2009-12-03Merge branch 'rg/doc-workflow' into maintLibravatar Junio C Hamano1-0/+115
2009-12-03Merge branch 'np/maint-sideband-favor-status' into maintLibravatar Junio C Hamano2-23/+23
2009-12-03Documentation: xmlto 0.0.18 does not know --stringparamLibravatar Junio C Hamano1-0/+7
2009-12-03t4201: use ISO8859-1 rather than ISO-8859-1Libravatar Brandon Casey1-2/+2
2009-12-03pull: clarify advice for the unconfigured error caseLibravatar Jan Krüger1-15/+33
2009-12-03Git 1.6.5.4Libravatar Junio C Hamano2-2/+3
2009-12-03Unconditionally set man.base.url.for.relative.linksLibravatar Junio C Hamano1-2/+5
2009-12-03Documentation/Makefile: allow man.base.url.for.relative.link to be set from MakeLibravatar Junio C Hamano1-0/+4
2009-12-02Prepare for 1.6.5.4Libravatar Junio C Hamano2-1/+33
2009-12-02merge: do not add standard message when message is given with -m optionLibravatar Junio C Hamano2-11/+10
2009-12-02Do not misidentify "git merge foo HEAD" as an old-style invocationLibravatar Junio C Hamano1-1/+1
2009-12-01help: Do not unnecessarily look for a repositoryLibravatar David Aguilar1-3/+3
2009-12-01Documentation: Fix a few i.e./e.g. mix-upsLibravatar Michael J Gruber2-2/+2
2009-11-30Documentation: Document --branch option in git clone synopsisLibravatar David Soria Parra1-1/+1
2009-11-29builtin-merge: show user-friendly error messages for fast-forward too.Libravatar Matthieu Moy1-0/+1
2009-11-29merge-recursive: make the error-message generation an extern functionLibravatar Matthieu Moy2-13/+21
2009-11-29builtin-merge.c: call exclude_cmds() correctly.Libravatar Avery Pennarun1-1/+1
2009-11-27Remove dead code from "git am"Libravatar Junio C Hamano1-5/+6
2009-11-26format-patch: add test for parsing of "--"Libravatar Felipe Contreras1-0/+5
2009-11-26format-patch: fix parsing of "--" on the command lineLibravatar Felipe Contreras1-1/+2
2009-11-26builtin-apply.c: pay attention to -p<n> when determining the nameLibravatar Junio C Hamano2-2/+20
2009-11-25shortlog: respect commit encodingLibravatar Uwe Kleine-König2-9/+39
2009-11-23pack-objects: split implications of --all-progress from progress activationLibravatar Nicolas Pitre4-5/+20
2009-11-23instaweb: restart server if already runningLibravatar Stephen Boyd1-0/+5
2009-11-23prune-packed: only show progress when stderr is a ttyLibravatar Jeff King1-1/+1
2009-11-23Protect scripted Porcelains from GREP_OPTIONS insanityLibravatar Junio C Hamano8-18/+26
2009-11-23mergetool--lib: simplify guess_merge_tool()Libravatar René Scharfe1-7/+6
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-11-21Documentation: avoid xmlto input errorLibravatar Junio C Hamano1-3/+3
2009-11-20Add branch management for releases to gitworkflowsLibravatar Raman Gupta1-0/+115
2009-11-20git am/mailinfo: Don't look at in-body headers when rebasingLibravatar Lukas Sandström16-5/+122
2009-11-20git remote: Separate usage strings for subcommandsLibravatar Tim Henigan2-21/+52
2009-11-20diffcore-rename: reduce memory footprint by freeing blob data earlyLibravatar Junio C Hamano1-2/+5
2009-11-19git-count-objects: Fix a disk-space under-estimate on CygwinLibravatar Ramsay Jones1-0/+1
2009-11-19Documentation: undocument gc'd function graph_release()Libravatar Greg Price2-6/+0
2009-11-19t9700-perl-git.sh: Fix a test failure on CygwinLibravatar Ramsay Jones1-1/+1
2009-11-19expand_user_path: expand ~ to $HOME, not to the actual homedir.Libravatar Matthieu Moy2-8/+14
2009-11-17Expand ~ and ~user in core.excludesfile, commit.templateLibravatar Matthieu Moy5-37/+63
2009-11-17Make sure $PERL_PATH is defined when the test suite is run.Libravatar Philippe Bruhat (BooK)4-4/+5
2009-11-16core.autocrlf documentation: mention the crlf attributeLibravatar Matthew Ogilvie1-3/+4