summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2009-12-16Git 1.6.5.7v1.6.5.7Junio C Hamano4-3/+23
2009-12-16worktree: don't segfault with an absolute pathspec without a work treeJunio C Hamano2-2/+20
2009-12-16ignore unknown color configurationJeff King4-3/+26
2009-12-15help.autocorrect: do not run a command if the command given is junkJohannes Sixt1-2/+5
2009-12-14Illustrate "filter" attribute with an exampleNanako Shiraishi1-0/+19
2009-12-10Git 1.6.5.6v1.6.5.6Junio C Hamano4-3/+27
2009-12-10Fix archive format with -- on the command lineJunio C Hamano1-6/+10
2009-12-10Remove post-upload-hookJunio C Hamano4-172/+2
2009-12-08Merge branch 'mm/maint-merge-ff-error-message-fix' into maintJunio C Hamano3-18/+27
2009-12-08Merge branch 'jn/maint-pull-rebase-error-message' into maintJunio C Hamano1-15/+33
2009-12-08Merge branch 'jk/maint-add-p-delete-fix' into maintJunio C Hamano2-1/+25
2009-12-07add-interactive: fix deletion of non-empty filesJeff King2-1/+25
2009-12-05Git 1.6.5.5v1.6.5.5Junio C Hamano4-5/+11
2009-12-05Fix diff -B/--dirstat miscounting of newly added contentsLinus Torvalds1-1/+10
2009-12-05reset: improve worktree safety valvesJeff King2-5/+33
2009-12-05Documentation: Avoid use of xmlto --stringparamTodd Zullinger3-11/+23
2009-12-04archive: clarify description of path parameterRené Scharfe1-2/+3
2009-12-04rerere: don't segfault on failure to open rr-cacheJeff King1-0/+2
2009-12-03Prepare for 1.6.5.5Junio C Hamano1-0/+44
2009-12-03Merge branch 'uk/maint-shortlog-encoding' into maintJunio C Hamano2-9/+39
2009-12-03Merge branch 'fc/maint-format-patch-pathspec-dashes' into maintJunio C Hamano2-1/+7
2009-12-03Merge branch 'ap/maint-merge-strategy-list-fix' into maintJunio C Hamano1-1/+1
2009-12-03Merge branch 'jc/maint-am-keep' into maintJunio C Hamano1-5/+6
2009-12-03Merge branch 'rs/work-around-grep-opt-insanity' into maintJunio C Hamano9-25/+32
2009-12-03Merge branch 'rj/maint-cygwin-count-objects' into maintJunio C Hamano1-0/+1
2009-12-03Merge branch 'mm/maint-hint-failed-merge' into maintJunio C Hamano5-3/+32
2009-12-03Merge branch 'th/maint-remote-update-help-string' into maintJunio C Hamano1-1/+1
2009-12-03Merge branch 'rj/maint-t9700' into maintJunio C Hamano1-1/+1
2009-12-03Merge branch 'ls/maint-mailinfo-no-inbody' into maintJunio C Hamano16-5/+122
2009-12-03Merge branch 'mo/maint-crlf-doc' into maintJunio C Hamano1-3/+4
2009-12-03Merge branch 'th/remote-usage' into maintJunio C Hamano2-21/+52
2009-12-03Merge branch 'pb/maint-use-custom-perl' into maintJunio C Hamano4-4/+5
2009-12-03Merge branch 'mm/config-pathname-tilde-expand' into maintJunio C Hamano5-37/+69
2009-12-03Merge branch 'bc/grep-i-F' into maintJunio C Hamano4-6/+27
2009-12-03Merge branch 'jk/maint-break-rename-reduce-memory' into maintJunio C Hamano2-3/+10
2009-12-03Merge branch 'rj/maint-simplify-cygwin-makefile' into maintJunio C Hamano1-4/+2
2009-12-03Merge branch 'rg/doc-workflow' into maintJunio C Hamano1-0/+115
2009-12-03Merge branch 'np/maint-sideband-favor-status' into maintJunio C Hamano2-23/+23
2009-12-03Documentation: xmlto 0.0.18 does not know --stringparamJunio C Hamano1-0/+7
2009-12-03t4201: use ISO8859-1 rather than ISO-8859-1Brandon Casey1-2/+2
2009-12-03pull: clarify advice for the unconfigured error caseJan Krüger1-15/+33
2009-12-03Git 1.6.5.4v1.6.5.4Junio C Hamano2-2/+3
2009-12-03Unconditionally set man.base.url.for.relative.linksJunio C Hamano1-2/+5
2009-12-03Documentation/Makefile: allow man.base.url.for.relative.link to be set from MakeJunio C Hamano1-0/+4
2009-12-02Prepare for 1.6.5.4Junio C Hamano2-1/+33
2009-12-02merge: do not add standard message when message is given with -m optionJunio C Hamano2-11/+10
2009-12-02Do not misidentify "git merge foo HEAD" as an old-style invocationJunio C Hamano1-1/+1
2009-12-01help: Do not unnecessarily look for a repositoryDavid Aguilar1-3/+3
2009-12-01Documentation: Fix a few i.e./e.g. mix-upsMichael J Gruber2-2/+2
2009-11-30Documentation: Document --branch option in git clone synopsisDavid Soria Parra1-1/+1
2009-11-29builtin-merge: show user-friendly error messages for fast-forward too.Matthieu Moy1-0/+1
2009-11-29merge-recursive: make the error-message generation an extern functionMatthieu Moy2-13/+21
2009-11-29builtin-merge.c: call exclude_cmds() correctly.Avery Pennarun1-1/+1
2009-11-27Remove dead code from "git am"Junio C Hamano1-5/+6
2009-11-26format-patch: add test for parsing of "--"Felipe Contreras1-0/+5
2009-11-26format-patch: fix parsing of "--" on the command lineFelipe Contreras1-1/+2
2009-11-26builtin-apply.c: pay attention to -p<n> when determining the nameJunio C Hamano2-2/+20
2009-11-25shortlog: respect commit encodingUwe Kleine-König2-9/+39
2009-11-23pack-objects: split implications of --all-progress from progress activationNicolas Pitre4-5/+20
2009-11-23instaweb: restart server if already runningStephen Boyd1-0/+5
2009-11-23prune-packed: only show progress when stderr is a ttyJeff King1-1/+1
2009-11-23Protect scripted Porcelains from GREP_OPTIONS insanityJunio C Hamano8-18/+26
2009-11-23mergetool--lib: simplify guess_merge_tool()René Scharfe1-7/+6
2009-11-22user-manual: Document that "git merge" doesn't like uncommited changes.Matthieu Moy1-2/+18
2009-11-22merge-recursive: point the user to commit when file would be overwritten.Matthieu Moy4-1/+14
2009-11-21Documentation: avoid xmlto input errorJunio C Hamano1-3/+3
2009-11-20Add branch management for releases to gitworkflowsRaman Gupta1-0/+115
2009-11-20git am/mailinfo: Don't look at in-body headers when rebasingLukas Sandström16-5/+122
2009-11-20git remote: Separate usage strings for subcommandsTim Henigan2-21/+52
2009-11-20diffcore-rename: reduce memory footprint by freeing blob data earlyJunio C Hamano1-2/+5
2009-11-19git-count-objects: Fix a disk-space under-estimate on CygwinRamsay Jones1-0/+1
2009-11-19Documentation: undocument gc'd function graph_release()Greg Price2-6/+0
2009-11-19t9700-perl-git.sh: Fix a test failure on CygwinRamsay Jones1-1/+1
2009-11-19expand_user_path: expand ~ to $HOME, not to the actual homedir.Matthieu Moy2-8/+14
2009-11-17Expand ~ and ~user in core.excludesfile, commit.templateMatthieu Moy5-37/+63
2009-11-17Make sure $PERL_PATH is defined when the test suite is run.Philippe Bruhat (BooK)4-4/+5
2009-11-16core.autocrlf documentation: mention the crlf attributeMatthew Ogilvie1-3/+4
2009-11-16grep: Allow case insensitive search of fixed-stringsBrian Collins4-6/+27
2009-11-16diffcore-break: save cnt_data for other phasesJeff King1-3/+3
2009-11-16diffcore-break: free filespec data as we goJeff King1-0/+4
2009-11-16Git 1.6.5.3v1.6.5.3Junio C Hamano4-3/+67
2009-11-16Merge branch 'bs/maint-pre-commit-hook-sample' into maintJunio C Hamano1-9/+9
2009-11-16Merge branch 'jk/maint-add-p-empty' into maintJunio C Hamano2-5/+30
2009-11-16Merge branch 'js/maint-diff-color-words' into maintJunio C Hamano2-8/+32
2009-11-15Merge branch 'tz/maint-rpm' into maintJunio C Hamano1-1/+4
2009-11-15Merge branch 'jk/maint-format-patch-p-suppress-stat' into maintJunio C Hamano2-2/+28
2009-11-15Merge branch 'pb/maint-gitweb-blob-lineno' into maintJunio C Hamano1-1/+2
2009-11-15Merge branch 'jk/maint-1.6.3-ls-files-i' into maintJunio C Hamano3-2/+20
2009-11-15Merge branch 'vl/maint-openssl-signature-change' into maintJunio C Hamano1-0/+4
2009-11-15Merge branch 'jk/maint-push-config' into maintJunio C Hamano1-2/+1
2009-11-15Merge branch 'sr/blame-incomplete' into maintJunio C Hamano1-0/+6
2009-11-15Merge branch 'jc/maint-blank-at-eof' into maintJunio C Hamano8-173/+437
2009-11-15Merge branch 'jc/maint-1.6.3-graft-trailing-space' into maintJunio C Hamano1-2/+2
2009-11-15Merge branch 'tr/maint-roff-quote' into maintJunio C Hamano3-0/+28
2009-11-15Merge branch 'ja/fetch-doc' into maintJunio C Hamano3-67/+76
2009-11-15Merge branch 'cb/doc-fetch-pull-merge' into maintJunio C Hamano3-45/+66
2009-11-15Merge branch 'jk/maint-cvsimport-pathname' into maintJunio C Hamano1-3/+14
2009-11-15Merge branch 'jc/receive-pack-auto' into maintJunio C Hamano3-4/+36
2009-11-15Merge branch 'gb/maint-gitweb-esc-param' into maintJunio C Hamano1-2/+1
2009-11-15Merge branch 'jn/gitweb-patch' into maintJunio C Hamano1-3/+3
2009-11-15Update 'git remote update' usage string to match man page.Tim Henigan1-1/+1
2009-11-14Makefile: Ensure rpm packages can be read by older rpm versionsTodd Zullinger1-1/+4
2009-11-14git-add.txt: fix formatting of --patch sectionStephen Boyd1-4/+4
2009-11-13give priority to progress messagesNicolas Pitre2-23/+23
2009-11-10check-ref-format -h: it does not know the --print option yetJunio C Hamano1-1/+1
2009-11-10merge: do not setup worktree twiceJonathan Nieder1-1/+0
2009-11-10check-ref-format: update usage stringJonathan Nieder1-1/+5
2009-11-08Makefile: merge two Cygwin configuration sections into oneRamsay Jones1-4/+2
2009-11-08Add intermediate build products to .gitignoreJonathan Nieder1-0/+1
2009-11-08format-patch: make "-p" suppress diffstatJeff King2-2/+28
2009-11-06pre-commit.sample: Diff against the empty tree when HEAD is invalidBjörn Steinbrink1-9/+9
2009-11-06gitweb: Fix blob linenr links in pathinfo modePetr Baudis1-1/+2
2009-11-04Fix documentation grammar typoGisle Aas1-1/+1
2009-11-03Allow curl helper to work without a local repositoryDaniel Barkalow1-1/+4
2009-11-03Require a struct remote in transport_get()Daniel Barkalow2-5/+8
2009-11-01Merge branch 'bg/clone-doc' into maintJunio C Hamano1-13/+13
2009-11-01Makefile: add compat/bswap.h to LIB_HDmitry V. Levin1-0/+1
2009-10-31imap-send.c: fix compiler warnings for OpenSSL 1.0Vietor Liu1-0/+4
2009-10-31diff --color-words: bit of clean-upJunio C Hamano1-14/+12
2009-10-30clone: detect extra argumentsJonathan Nieder1-1/+6
2009-10-30clone: fix help on optionsJunio C Hamano1-2/+4
2009-10-30push: fix typo in usageJeff King1-1/+1
2009-10-30More precise description of 'git describe --abbrev'Gisle Aas1-4/+13
2009-10-30ls-files: unbreak "ls-files -i"Jeff King3-2/+20
2009-10-30diff --color-words -U0: fix the location of hunk headersJohannes Schindelin2-1/+7
2009-10-30t4034-diff-words: add a test for word diff without contextMarkus Heidelberg1-0/+20
2009-10-28help -a: do not unnecessarily look for a repositoryJohannes Schindelin1-3/+3
2009-10-28Merge branch 'maint-1.6.4' into maintJunio C Hamano2-1/+7
2009-10-27Do not try to remove directories when removing old linksSebastian Schuberth1-1/+1
2009-10-27add-interactive: handle deletion of empty filesJeff King2-5/+30
2009-10-27rebase -i: more graceful handling of invalid commandsJan Krüger1-1/+6
2009-10-27help -i: properly error out if no info viewer can be foundGerrit Pape1-0/+1
2009-10-25push: always load default configJeff King1-2/+1
2009-10-25GIT 1.6.5.2v1.6.5.2Junio C Hamano4-3/+23
2009-10-25Merge branch 'jc/maint-fix-unpack-zlib-check' into maintJunio C Hamano1-5/+3
2009-10-25Merge branch 'maint-1.6.4' into maintJunio C Hamano2-8/+32
2009-10-25Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached' into maint-1.6.4Junio C Hamano2-8/+32
2009-10-25Merge branch 'jn/maint-1.6.3-check-ref-format-doc' into maint-1.6.4Junio C Hamano1-3/+6
2009-10-24t7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT testMarkus Heidelberg1-1/+1
2009-10-24Work around option parsing bug in the busybox tar implementationAndreas Schwab1-1/+1
2009-10-23Fix list of released versions in the toc documentJunio C Hamano1-1/+1
2009-10-23Merge branch 'jp/maint-send-email-fold' into maintJunio C Hamano2-22/+78
2009-10-23Merge branch 'jn/maint-1.6.3-check-ref-format-doc' into maintJunio C Hamano1-3/+6
2009-10-23Merge branch 'pv/maint-add-p-no-exclude' into maintJunio C Hamano2-1/+15
2009-10-23Do not fail "describe --always" in a tag-less repositoryJunio C Hamano2-1/+3
2009-10-22Quote ' as \(aq in manpagesThomas Rast3-0/+28
2009-10-22Documentation/merge-options.txt: order options in alphabetical groupsJari Aalto1-43/+45
2009-10-22Documentation/git-pull.txt: Add subtitles above included option filesJari Aalto1-0/+7
2009-10-21Fix incorrect error check while reading deflated pack dataJunio C Hamano1-5/+3
2009-10-21blame: make sure that the last line ends in an LFJohannes Schindelin1-0/+6
2009-10-21git-clone.txt: Fix grammar and formattingBjörn Gustavsson1-13/+13
2009-10-21receive-pack: run "gc --auto --quiet" and optionally "update-server-info"Junio C Hamano2-0/+29
2009-10-21gc --auto --quiet: make the notice a bit less verboaseJunio C Hamano1-4/+7
2009-10-21Documentation/fetch-options.txt: order options alphabeticallyJari Aalto1-24/+24
2009-10-21modernize fetch/merge/pull examplesClemens Buchacher3-45/+66
2009-10-21Document `delta` attribute in "git help attributes".Nasser Grainawi1-0/+10
2009-10-21Mark files in t/t5100 as UTF-8Johannes Sixt1-0/+4
2009-10-21Remove a left-over file from t/t5100Johannes Sixt1-35/+0
2009-10-20Documentation/git-gc.txt: change "references" to "reference"Matt Kraai1-1/+1
2009-10-19cvsimport: fix relative argument filenamesJeff King1-3/+14
2009-10-18git push: say that --tag can't be used with --all or --mirror in help textNanako Shiraishi1-1/+1
2009-10-18git push: remove incomplete options list from help textNanako Shiraishi1-1/+1
2009-10-18document push's new quiet optionJeff King1-0/+5
2009-10-18Makefile: clean block-sha1/ directory instead of mozilla-sha1/Carlos R. Mafra1-1/+1
2009-10-16GIT 1.6.5.1v1.6.5.1Junio C Hamano4-2/+23
2009-10-16Merge branch 'maint-1.6.4' into maintJunio C Hamano2-1/+67
2009-10-16grep: do not segfault when -f is usedMatt Kraai2-1/+67
2009-10-14info/grafts: allow trailing whitespaces at the end of lineJunio C Hamano1-2/+2
2009-10-14sha1_file: Fix infinite loop when pack is corruptedShawn O. Pearce2-0/+13
2009-10-14change throughput display units with fast linksNicolas Pitre1-1/+7
2009-10-14clone: Supply the right commit hash to post-checkout when -b is usedBjörn Steinbrink2-1/+3
2009-10-14gitweb: fix esc_paramGiuseppe Bilotta1-2/+1
2009-10-13remote-curl: add missing initialization of argv0_pathJohannes Sixt1-0/+1
2009-10-13Merge branch 'maint-1.6.4' into maintJunio C Hamano1-1/+2
2009-10-12Documentation: describe check-ref-format --branchJonathan Nieder1-3/+6
2009-10-12git-stash documentation: mention default options for 'list'Miklos Vajna1-1/+2
2009-10-12ls-files: excludes should not impact tracked filesJeff King2-8/+32
2009-10-10git-add--interactive: never skip files included in indexPauli Virtanen2-1/+15
2009-10-10GIT 1.6.5v1.6.5Junio C Hamano3-7/+6
2009-10-10git-svn: hide find_parent_branch output in double quiet modeSimon Arlott1-7/+12
2009-10-09Documentation: clone: clarify discussion of initial branchJonathan Nieder1-2/+3
2009-10-09git-send-email.perl: fold multiple entry "Cc:" and multiple single line "RCPT...Joe Perches2-22/+78
2009-10-09Merge branch 'rs/maint-archive-prefix'Junio C Hamano2-3/+16
2009-10-09Merge branch 'fc/mutt-alias'Junio C Hamano1-1/+1
2009-10-09Merge branch 'ef/msvc-noreturn'Junio C Hamano3-9/+11
2009-10-09Merge branch 'jk/reflog-date'Junio C Hamano3-2/+7
2009-10-09Merge branch 'ch/am-header'Junio C Hamano1-1/+1
2009-10-09bash: add support for 'git replace'Björn Gustavsson1-0/+6
2009-10-09completion: fix alias listings with newlinesStephen Boyd1-2/+6
2009-10-09completion: fix completion of git <TAB><TAB>Stephen Boyd1-1/+1
2009-10-09import-tars: Add missing closing bracketIngmar Vanhassel1-1/+1
2009-10-09gitweb: Do not show 'patch' link for merge commitsJakub Narebski1-3/+3
2009-10-09racy-git.txt: explain nsec problem in more detailJonathan Nieder1-4/+6
2009-10-09Documentation: clarify "working tree" definitionJonathan Nieder1-3/+3
2009-10-09Documentation: clarify branch creationJonathan Nieder1-8/+8
2009-10-09Documentation: branch: update --merged descriptionJonathan Nieder1-4/+6
2009-10-09Documentation: clarify mergeoptions descriptionJonathan Nieder2-3/+3
2009-10-09Documentation: git fmt-merge-msg does not have to be a scriptJonathan Nieder2-5/+6
2009-10-09Describe DOCBOOK_XSL_172, ASCIIDOC_NO_ROFF options in MakefileJonathan Nieder1-1/+5
2009-10-09pull: improve advice for unconfigured error caseJeff King1-4/+12