summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2010-12-15Git 1.6.5.9v1.6.5.9Junio C Hamano5-18/+64
2010-12-15Git 1.6.4.5v1.6.4.5Junio C Hamano3-2/+22
2010-12-15gitweb: Introduce esc_attr to escape attributes of HTML elementsJakub Narebski1-15/+22
2010-07-25request-pull.txt: Document -p optionStephen Boyd1-1/+4
2010-07-25Merge branch 'maint-1.6.4' into maint-1.6.5Junio C Hamano3-2/+22
2010-07-25Check size of path buffer before writing into itGreg Brockman1-0/+2
2010-07-07rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-optionUwe Kleine-König2-2/+20
2010-03-04Remove extra '-' from git-am(1)Michal Sojka1-1/+1
2010-02-16dwim_ref: fix dangling symref warningJeff King1-2/+1
2010-02-15stash pop: remove 'apply' options during 'drop' invocationThomas Rast2-2/+14
2010-02-15diff: make sure --output=/bad/path is caughtLarry D'Anna1-0/+2
2010-02-10t8003: check exit code of command and error message separatelyJunio C Hamano1-2/+4
2010-02-08blame: prevent a segv when -L given start > EOFJay Soffian2-1/+9
2010-02-01Merge branch 'sb/maint-octopus' into maint-1.6.5Junio C Hamano2-9/+57
2010-02-01Merge branch 'bg/maint-add-all-doc' into maint-1.6.5Junio C Hamano2-29/+88
2010-01-29fix memcpy of overlapping areaJeff King1-1/+1
2010-01-20Git 1.6.5.8v1.6.5.8Junio C Hamano4-3/+32
2010-01-20Merge branch 'jk/maint-1.6.5-reset-hard' into maint-1.6.5Junio C Hamano2-4/+8
2010-01-20Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule-changes' into maint-1...Junio C Hamano1-4/+2
2010-01-20Merge branch 'dp/maint-1.6.5-fast-import-non-commit-tag' into maint-1.6.5Junio C Hamano1-5/+5
2010-01-20Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into maint-1.6.5Junio C Hamano1-0/+1
2010-01-18Merge branch 'maint-1.6.4' into maint-1.6.5Junio C Hamano8-43/+47
2010-01-18Merge branch 'maint-1.6.3' into maint-1.6.4Junio C Hamano8-43/+47
2010-01-18Merge branch 'maint-1.6.2' into maint-1.6.3Junio C Hamano8-43/+47
2010-01-18Merge commit 'v1.6.4.4-8-g8de6518' into maint-1.6.4Junio C Hamano1-1/+5
2010-01-18Fix mis-backport of t7002Junio C Hamano1-1/+5
2010-01-18grep: NUL terminate input from a fileJim Meyering1-0/+1
2010-01-14fast-import: tag may point to any object typeDmitry Potapov1-5/+5
2010-01-10Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano8-43/+47
2010-01-10Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano4-28/+28
2010-01-09base85: Make the code more obvious instead of explaining the non-obviousAndreas Gruenbacher1-8/+2
2010-01-09base85: encode_85() does not use the decode tableAndreas Gruenbacher1-2/+0
2010-01-09base85 debug code: Fix length byte calculationAndreas Gruenbacher1-1/+1
2010-01-07git-rm doc: Describe how to sync index & work treeBjörn Gustavsson1-1/+53
2010-01-06checkout -m: do not try to fall back to --merge from an unborn branchJunio C Hamano1-2/+8
2009-12-31branch: die explicitly why when calling "git branch [-a|-r] branchname".Matthieu Moy2-15/+17
2009-12-31bash completion: factor submodules into dirty stateThomas Rast1-4/+2
2009-12-30textconv: stop leaking file descriptorsJeff King1-0/+2
2009-12-30reset: unbreak hard resets with GIT_WORK_TREEJeff King2-4/+8
2009-12-29Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2-9/+11
2009-12-29commit: --cleanup is a message optionGreg Price1-2/+4
2009-12-29git count-objects: handle packs bigger than 4GAndreas Schwab1-6/+6
2009-12-29t7102: make the test fail if one of its check failsNguyễn Thái Ngọc Duy1-7/+7
2009-12-22Prevent git blame from segfaulting on a missing author nameDavid Reiss2-3/+23
2009-12-19rebase -i: abort cleanly if the editor fails to launchBjörn Gustavsson1-1/+1
2009-12-17technical-docs: document hash APIStephen Boyd1-2/+48
2009-12-17api-strbuf.txt: fix typos and document launch_editor()Stephen Boyd1-2/+8
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-13octopus: remove dead codeStephen Boyd1-5/+1
2009-12-13octopus: reenable fast-forward mergesStephen Boyd2-1/+19
2009-12-13octopus: make merge process simpler to followStephen Boyd2-4/+38
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-07git-add/rm doc: Consistently back-quoteBjörn Gustavsson2-15/+15
2009-12-07Documentation: 'git add -A' can remove filesBjörn Gustavsson1-13/+20
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
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-18 18:43:55 +0000