summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2010-01-20Git 1.6.6.1v1.6.6.1Junio C Hamano3-8/+16
2010-01-20Merge branch 'bg/maint-remote-update-default' into maintJunio C Hamano2-6/+18
2010-01-20Merge branch 'sb/maint-octopus' into maintJunio C Hamano2-9/+57
2010-01-20Merge branch 'bg/maint-add-all-doc' into maintJunio C Hamano2-29/+88
2010-01-20Merge branch 'maint-1.6.5' into maintJunio C Hamano5-9/+40
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-19bisect: fix singular/plural grammar nitDavid Ripton1-3/+5
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-18Update draft release notes to 1.6.6.1Junio C Hamano1-1/+16
2010-01-18Merge branch 'dp/maint-1.6.5-fast-import-non-commit-tag' into maintJunio C Hamano1-5/+5
2010-01-18Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into maintJunio C Hamano1-0/+1
2010-01-18grep: NUL terminate input from a fileJim Meyering1-0/+1
2010-01-15Fix uninitialized variable in get_refs_via_rsync().Richard Weinberger1-1/+1
2010-01-14Document git-blame triple -C optionRamkumar Ramachandra2-3/+5
2010-01-14fast-import: tag may point to any object typeDmitry Potapov1-5/+5
2010-01-12remote-curl: Fix Accept header for smart HTTP connectionsShawn O. Pearce2-2/+2
2010-01-12grep: -L should show empty filesJunio C Hamano1-2/+0
2010-01-11rebase--interactive: Ignore comments and blank lines in peek_next_commandMichael Haggerty1-1/+1
2010-01-10Merge branch 'maint-1.6.2' into maintJunio C Hamano2-13/+11
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-09Documentation: tiny git config manual tweaksJonathan Nieder1-4/+4
2010-01-09Documentation: git gc packs refs by default nowJonathan Nieder1-9/+6
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
2010-01-02stash: mention --patch in usage string.Matthieu Moy1-1/+1
2009-12-31Merge branch 'maint-1.6.0' into maintJunio C Hamano2-15/+17
2009-12-31branch: die explicitly why when calling "git branch [-a|-r] branchname".Matthieu Moy2-15/+17
2009-12-31fast-import: Document author/committer/tagger name is optionalShawn O. Pearce2-6/+6
2009-12-31SubmittingPatches: hints to know the status of a submitted patch.Matthieu Moy1-0/+14
2009-12-31bash completion: factor submodules into dirty stateThomas Rast1-4/+2
2009-12-31Fix "git remote update" with remotes.defalt setBjörn Gustavsson2-6/+18
2009-12-30Merge branch 'maint-1.6.1' into maintJunio C Hamano4-15/+19
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-29Documentation: always respect core.worktree if setNguyễn Thái Ngọc Duy1-8/+15
2009-12-27Merge branch 'nf/maint-fix-index-ext-len-on-be64' into maintJunio C Hamano1-1/+1
2009-12-27read_index(): fix reading extension size on BE 64-bit archsNathaniel W Filardo1-1/+1
2009-12-26Makefile: FreeBSD (both 7 and 8) needs OLD_ICONVJunio C Hamano1-0/+1
2009-12-26Start 1.6.6.X maintenance trackJunio C Hamano2-1/+16
2009-12-26Merge branch 'jc/maint-obsd46' into maintJunio C Hamano2-29/+29
2009-12-26Add git-http-backend to command-list.Tarmigan Casebolt1-0/+1
2009-12-26t4019 "grep" portability fixJunio C Hamano1-28/+28
2009-12-26t1200: work around a bug in some implementations of "find"Junio C Hamano1-1/+1
2009-12-23Git 1.6.6v1.6.6Junio C Hamano3-4/+6
2009-12-23git svn: add test for a git svn gc followed by a git svn mkdirsRobert Zeh1-0/+40
2009-12-23git svn: branch/tag commands detect username in URLsEric Wong1-1/+2
2009-12-22Merge branch 'maint'Junio C Hamano2-3/+23
2009-12-22git svn: lookup new parents correctly from svn:mergeinfoEric Wong1-1/+2
2009-12-22Prevent git blame from segfaulting on a missing author nameDavid Reiss2-3/+23
2009-12-21git-svn: Remove obsolete MAXPARENT checkAndrew Myrick1-6/+0
2009-12-21git-svn: detect cherry-picks correctly.Sam Vilain2-25/+66
2009-12-21git-svn: exclude already merged tips using one rev-list callSam Vilain1-4/+48
2009-12-21git-svn: fix some mistakes with interpreting SVN mergeinfo commit rangesSam Vilain2-10/+4
2009-12-21git-svn: memoize conversion of SVN merge ticket info to git commit rangesSam Vilain1-37/+54
2009-12-21git-svn: expand the svn mergeinfo test suite, highlighting some failuresSam Vilain3-172/+860
2009-12-21update release notes for git svn in 1.6.6Eric Wong1-0/+2
2009-12-21git svn: fix --revision when fetching deleted pathsEric Wong1-1/+5
2009-12-20Git 1.6.6-rc4v1.6.6-rc4Junio C Hamano2-8/+9
2009-12-19Merge branch 'maint'Junio C Hamano3-5/+57
2009-12-19rebase -i: abort cleanly if the editor fails to launchBjörn Gustavsson1-1/+1
2009-12-19t9146: use 'svn_cmd' wrapperEric Wong1-1/+1
2009-12-19git svn: make empty directory creation gc-awareEric Wong2-11/+58
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.6-rc3v1.6.6-rc3Junio C Hamano2-7/+1
2009-12-16Merge branch 'maint' to sync with 1.6.5.7Junio C Hamano10-8/+91
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-12bash: Support new 'git fetch' optionsBjörn Gustavsson1-2/+12
2009-12-10Update Release Notes for 1.6.6 to remove old bugfixesJunio C Hamano1-16/+0
2009-12-10Sync with 1.6.5.6Junio C Hamano7-179/+37
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-09Git 1.6.6-rc2v1.6.6-rc2Junio C Hamano2-4/+10
2009-12-09Merge git://repo.or.cz/git-guiJunio C Hamano4-13/+37
2009-12-09Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2-274/+1816
2009-12-09Update draft release notes to 1.6.6 before -rc2Junio C Hamano1-21/+18
2009-12-08Merge branch 'maint'Junio C Hamano3-16/+58
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-08Merge git://git.bogomips.org/git-svnJunio C Hamano1-1/+3
2009-12-08git-svn: set svn.authorsfile earlier when cloningAlex Vandiver1-1/+1
2009-12-08git-svn: Set svn.authorsfile to an absolute path when cloningAlex Vandiver1-1/+3
2009-12-08Revert recent "git merge <msg> HEAD <commit>..." deprecationJunio C Hamano2-9/+3
2009-12-07add-interactive: fix deletion of non-empty filesJeff King2-1/+25
2009-12-07git svn: log removals of empty directoriesEric Wong2-1/+11
2009-12-07git svn: Don't create empty directories whose parents were deletedGreg Price1-1/+2
2009-12-07git-svn: sort svk merge tickets to account for minimal parentsAlex Vandiver1-1/+5
2009-12-07git-add/rm doc: Consistently back-quoteBjörn Gustavsson2-15/+15
2009-12-07git-gui: suppress RenderBadPicture X error caused by Tk bugJindrich Makovicka1-0/+5
2009-12-07Documentation: 'git add -A' can remove filesBjörn Gustavsson1-13/+20
2009-12-05bash: update 'git commit' completionSZEDER Gábor1-1/+21
2009-12-05git-gui: Increase blame viewer usability on MacOS.Alexander Gavrilov1-1/+15
2009-12-05git-gui: search 4 directories to improve statistic of gc hintClemens Buchacher1-11/+10
2009-12-05git gui: make current branch default in "remote delete branch" merge checkHeiko Voigt1-1/+7
2009-12-05Sync with 1.6.5.5Junio C Hamano10-22/+80
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-03Merge branch 'maint'Junio C Hamano3-2/+53
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-03gitweb: Describe (possible) gitweb.js minification in gitweb/READMEJakub Narebski1-1/+2
2009-12-03Documentation: xmlto 0.0.18 does not know --stringparamJunio C Hamano1-0/+7
2009-12-03Fix crasher on encountering SHA1-like non-note in notes treeJohan Herland2-0/+174
2009-12-03t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'Brandon Casey1-1/+1
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-03Merge in 1.6.5.4Junio C Hamano2-3/+7
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-03Merge branch 'maint'Junio C Hamano1-0/+4
2009-12-03Documentation/Makefile: allow man.base.url.for.relative.link to be set from MakeJunio C Hamano1-0/+4
2009-12-02Git 1.6.6-rc1v1.6.6-rc1Junio C Hamano2-2/+2
2009-12-02git-pull.sh: Fix call to git-merge for new command formatHorst H. von Brand1-3/+3
2009-12-02Merge branch 'maint'Junio C Hamano3-12/+43
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-01Update draft release notes to 1.6.6 before -rc1Junio C Hamano1-20/+67
2009-12-01Merge branch 'maint'Junio C Hamano4-6/+6
2009-12-01Merge branch 'jc/deprecate-old-syntax-from-merge'Junio C Hamano1-0/+6
2009-12-01git-merge: a deprecation notice of the ancient command line syntaxJunio C Hamano1-0/+6
2009-12-01Merge branch 'bw/remote-get-ref-states-fix'Junio C Hamano1-2/+4
2009-12-01get_ref_states: strdup entries and free util in stale listBert Wesarg1-2/+4
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-12-01Merge branch 'jn/gitweb-blame'Junio C Hamano6-88/+1173
2009-12-01gitweb: Add link to other blame implementation in blame viewsJakub Narebski1-0/+11
2009-11-30gitweb: Make linking to actions requiring JavaScript a featureJakub Narebski1-1/+8
2009-11-30Merge branch 'fc/maint-format-patch-pathspec-dashes'Junio C Hamano2-1/+7
2009-11-30Merge branch 'mm/maint-merge-ff-error-message-fix'Junio C Hamano3-18/+27
2009-11-30Merge branch 'ap/maint-merge-strategy-list-fix'Junio C Hamano1-1/+1
2009-11-30Merge branch 'jc/pretty-lf'Junio C Hamano3-2/+70
2009-11-30Merge branch 'cc/bisect-doc'Junio C Hamano3-0/+1364
2009-11-30Merge branch 'em/commit-claim'Junio C Hamano3-4/+129
2009-11-30Merge branch 'jc/mailinfo-remove-brackets'Junio C Hamano2-21/+35
2009-11-30Merge branch 'fc/send-email-envelope'Junio C Hamano3-4/+41
2009-11-30Merge branch 'uk/maint-shortlog-encoding'Junio C Hamano2-8/+39
2009-11-30Merge branch 'ns/send-email-no-chain-reply-to'Junio C Hamano2-2/+66
2009-11-30Merge branch 'jc/maint-am-keep'Junio C Hamano1-5/+6
2009-11-30Merge branch 'bw/diff-color-hunk-header'Junio C Hamano5-19/+63
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-29t/README: Document GIT_TEST_INSTALLED and GIT_TEST_EXEC_PATHMatthew Ogilvie1-0/+13
2009-11-29t3409 t4107 t7406 t9150: use dashless commandsMatthew Ogilvie4-16/+16
2009-11-29builtin-merge.c: call exclude_cmds() correctly.Avery Pennarun1-1/+1
2009-11-29t2300: use documented technique to invoke git-sh-setupMatthew Ogilvie1-1/+1
2009-11-29prepare send-email for smoother change of --chain-reply-to defaultNanako Shiraishi2-2/+66
2009-11-28Update draft release notes to 1.6.6 before merging topics for -rc1Junio C Hamano1-33/+100
2009-11-28Makefile: do not clean arm directoryJonathan Nieder1-1/+1
2009-11-28Give the hunk comment its own colorBert Wesarg5-9/+52
2009-11-27send-email: automatic envelope senderFelipe Contreras3-4/+24
2009-11-27emit_line(): don't emit an empty <SET><RESET> followed by a newlineJunio C Hamano2-10/+11