summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2010-02-10Git 1.6.6.2v1.6.6.2Junio C Hamano4-3/+50
2010-02-10Merge branch 'maint-1.6.5' into maintJunio C Hamano1-2/+4
2010-02-10t8003: check exit code of command and error message separatelyJunio C Hamano1-2/+4
2010-02-10Merge branch 'sp/maint-fast-import-large-blob' into maintJunio C Hamano5-20/+227
2010-02-10Merge branch 'gp/maint-cvsserver' into maintJunio C Hamano1-1/+1
2010-02-10Merge branch 'jc/maint-reflog-bad-timestamp' into maintJunio C Hamano4-10/+86
2010-02-10Merge branch 'il/maint-xmallocz' into maintJunio C Hamano4-10/+15
2010-02-10Merge branch 'jh/maint-config-file-prefix' into maintJunio C Hamano2-1/+12
2010-02-10Merge branch 'nd/include-termios-for-osol' into maintJunio C Hamano1-0/+1
2010-02-10Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge' into maintJunio C Hamano2-1/+58
2010-02-10Merge branch 'rs/maint-archive-match-pathspec' into maintJunio C Hamano1-1/+24
2010-02-10check-ref-format documentation: fix enumeration mark-upJunio C Hamano1-1/+1
2010-02-08Merge branch 'maint-1.6.5' into maintJunio C Hamano2-1/+9
2010-02-08blame: prevent a segv when -L given start > EOFJay Soffian2-1/+9
2010-02-08Merge branch 'jc/maint-push-doc-status' into maintJunio C Hamano1-5/+10
2010-02-08git-push: document all the status flags used in the outputJunio C Hamano1-5/+10
2010-02-08Merge branch 'jc/maint-imap-config-parse' into maintJunio C Hamano1-7/+8
2010-02-08Fix parsing of imap.preformattedHTML and imap.sslverifyJunio C Hamano1-7/+8
2010-02-08Merge branch 'jc/maint-doc-git-add-example' into maintJunio C Hamano1-1/+1
2010-02-08git-add documentation: Fix shell quoting exampleJunio C Hamano1-1/+1
2010-02-07archive: simplify archive format guessingRené Scharfe2-18/+26
2010-02-05Update git fsck --full short description to mention packsWesley J. Landaker1-1/+1
2010-02-05Merge branch 'jc/maint-limit-note-output' into maintJunio C Hamano8-1/+85
2010-02-01fast-import: Stream very large blobs directly to packShawn O. Pearce5-20/+227
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-29Merge branch 'maint-1.6.5' into maintJunio C Hamano1-1/+1
2010-01-29fix memcpy of overlapping areaJeff King1-1/+1
2010-01-28bash: don't offer remote transport helpers as subcommandsSZEDER Gábor1-0/+1
2010-01-27t0101: use a fixed timestamp when searching in the reflogJunio C Hamano1-2/+2
2010-01-27Update @{bogus.timestamp} fix not to die()Junio C Hamano1-2/+2
2010-01-26approxidate_careful() reports errorneous date stringJunio C Hamano4-10/+86
2010-01-26Fix integer overflow in unpack_compressed_entry()Ilari Liusvaara1-2/+1
2010-01-26Fix integer overflow in unpack_sha1_rest()Ilari Liusvaara1-2/+1
2010-01-26Fix integer overflow in patch_delta()Ilari Liusvaara1-2/+1
2010-01-26Add xmallocz()Ilari Liusvaara2-4/+12
2010-01-26git-cvsserver: allow regex metacharacters in CVSROOTGerrit Pape1-1/+1
2010-01-26builtin-config: Fix crash when using "-f <relative path>" from non-root dirJohan Herland2-1/+12
2010-01-24Merge branch 'maint' of git://git.spearce.org/git-gui into maintJunio C Hamano5-23/+48
2010-01-23git-gui: work from the .git dirGiuseppe Bilotta1-0/+10
2010-01-23git-gui: Fix applying a line when all following lines are deletionsJeff Epler1-0/+1
2010-01-23git-gui: Correct file_states when unstaging partly staged entryJens Lehmann1-0/+3
2010-01-23git-gui: Fix gitk for branch whose name matches local filePeter Krefting1-1/+1
2010-01-23git-gui: Keep repo_config(gui.recentrepos) and .gitconfig in syncChristopher Beelby1-0/+4
2010-01-23git-gui: handle really long error messages in updateindex.Pat Thoyts1-16/+18
2010-01-22ignore duplicated slashes in make_relative_path()Junio C Hamano2-9/+36
2010-01-21merge-recursive: do not return NULL only to cause segfaultJunio C Hamano1-4/+4
2010-01-21retry request without query when info/refs?query failsTay Ray Chuan1-2/+16
2010-01-21Fix "log --oneline" not to show notesJunio C Hamano3-4/+7
2010-01-20Merge branch 'jc/maint-refresh-index-is-optional-for-status' into maintJunio C Hamano1-4/+6
2010-01-20Fix "log" family not to be too agressive about showing notesJunio C Hamano8-1/+82
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-19status: don't require the repository to be writableJunio C Hamano1-4/+6
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-11Add missing #include to support TIOCGWINSZ on SolarisNguyễn Thái Ngọc Duy1-0/+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-06git-gui: Add hotkeys for "Unstage from commit" and "Revert changes"Vitaly _Vi Shukela1-2/+8
2010-01-06git-gui: Makefile: consolidate .FORCE-* targetsJonathan Nieder1-4/+3
2010-01-06checkout -m path: fix recreating conflictsJunio C Hamano2-1/+58
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-30archive: complain about path specs that don't match anythingRené Scharfe1-1/+24
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