summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2009-02-07GIT 1.6.2-rc0v1.6.2-rc0Junio C Hamano2-16/+58
2009-02-07Merge branch 'tr/add-p-single'Junio C Hamano2-16/+73
2009-02-07Merge branch 'js/filter-branch-submodule'Junio C Hamano2-14/+17
2009-02-07Merge branch 'maint'Junio C Hamano1-0/+32
2009-02-07emacs: Remove the no longer maintained vc-git package.Alexandre Julliard2-217/+1
2009-02-07git.el: Add some notes about Emacs versions compatibility.Alexandre Julliard1-2/+10
2009-02-07git.el: Use integer instead of character constants in case statement.Alexandre Julliard1-15/+15
2009-02-07git.el: Set a regexp for paragraph-separate in log-edit mode.Alexandre Julliard1-0/+1
2009-02-07git.el: Make git-run-command-region display the error if any.Alexandre Julliard1-19/+19
2009-02-07git.el: Add commands for cherry-pick and revert.Alexandre Julliard1-0/+42
2009-02-07git.el: Add a command to create a new branch.Alexandre Julliard1-0/+14
2009-02-07git.el: Add a checkout command.Alexandre Julliard1-2/+31
2009-02-07GIT 1.6.1.3v1.6.1.3Junio C Hamano3-2/+34
2009-02-07add -p: import Term::ReadKey with 'require'Thomas Rast1-1/+4
2009-02-05Merge branch 'js/maint-remote-remove-mirror'Junio C Hamano2-7/+58
2009-02-05Merge branch 'js/notes'Junio C Hamano15-0/+504
2009-02-05Merge branch 'jc/refuse-push-to-current'Junio C Hamano2-18/+46
2009-02-05Merge branch 'rc/http-push'Junio C Hamano1-37/+30
2009-02-05Merge branch 'gt/utf8-width'Junio C Hamano3-5/+27
2009-02-05Merge branch 'jk/head-symref'Junio C Hamano3-2/+46
2009-02-05Merge branch 'cb/mergetool'Junio C Hamano2-20/+70
2009-02-05Merge branch 'maint'Junio C Hamano1-1/+4
2009-02-05Merge branch 'maint-1.6.0' into maintJunio C Hamano1-1/+4
2009-02-05Merge branch 'jc/maint-apply-fix' into maintJunio C Hamano1-1/+1
2009-02-05Merge branch 'am/maint-push-doc' into maintJunio C Hamano2-23/+34
2009-02-05Merge branch 'sg/maint-gitdir-in-subdir' into maintJunio C Hamano2-1/+12
2009-02-05Merge branch 'lt/maint-wrap-zlib' into maintJunio C Hamano9-34/+99
2009-02-05Merge branch 'jc/maint-split-diff-metainfo' into maintJunio C Hamano3-67/+99
2009-02-05Merge branch 'js/maint-all-implies-HEAD' into maintJunio C Hamano6-2/+63
2009-02-05Merge branch 'kc/maint-diff-bwi-fix' into maintJunio C Hamano2-2/+31
2009-02-05filter-branch: do not consider diverging submodules a 'dirty worktree'Johannes Schindelin1-1/+1
2009-02-05add -p: print errors in separate colorThomas Rast2-12/+22
2009-02-05add -p: prompt for single charactersThomas Rast2-4/+48
2009-02-05Makefile: minor improvements for Mac OS X (Darwin)Jay Soffian1-2/+4
2009-02-05config.mak.in: define paths without trailing slashPascal Obry1-2/+2
2009-02-05Makefile: fix misdetection of relative pathnamesJunio C Hamano1-2/+2
2009-02-04Fixed broken git help -w when installing from RPMDavid J. Mellor1-1/+4
2009-02-04Merge branch 'jc/fsck' (early part)Junio C Hamano2-14/+51
2009-02-04builtin-blame.c: Use utf8_strwidth for author's namesGeoffrey Thomas1-5/+7
2009-02-04utf8: add utf8_strwidth()Geoffrey Thomas2-0/+20
2009-02-04git-bundle doc: update examplesNanako Shiraishi1-48/+84
2009-02-04Replace deprecated dashed git commands in usageAlexander Potashev10-11/+11
2009-02-04git-show-branch doc: show -g as synonym to --reflog in the listjidanni@jidanni.org1-2/+2
2009-02-04contrib git-resurrect: find traces of a branch name and resurrect itThomas Rast1-0/+180
2009-02-04Merge branch 'maint'Junio C Hamano3-9/+17
2009-02-04Merge branch 'wp/add-patch-find'Junio C Hamano1-22/+64
2009-02-04Merge branch 'ns/am-slacker'Junio C Hamano3-2/+69
2009-02-04urls.txt: document optional port specification in git URLSStefan Naewe1-4/+4
2009-02-04Merge branch 'maint-1.6.0' into maintJunio C Hamano2-5/+13
2009-02-04builtin-mv.c: check for unversionned files before looking at the destination.Matthieu Moy2-5/+5
2009-02-04Add a testcase for "git mv -f" on untracked files.Matthieu Moy1-0/+8
2009-02-04Missing && in t/t7001.sh.Matthieu Moy1-1/+1
2009-02-04builtin-remote: make rm operation safer in mirrored repositoryJay Soffian2-2/+53
2009-02-04add -p: trap Ctrl-D in 'goto' modeThomas Rast1-0/+3
2009-02-04add -p: change prompt separator for 'g'Thomas Rast1-1/+1
2009-02-04Merge branch 'maint'Junio C Hamano5-3/+4
2009-02-03Merge branch 'maint-1.6.0' into maintJunio C Hamano5-4/+4
2009-02-03http-push: wrap signature of get_remote_object_urlTay Ray Chuan1-1/+2
2009-02-03http-push: add back underscore separator before lock tokenTay Ray Chuan1-0/+1
2009-02-03User-manual: "git stash <comment>" form is long goneWilliam Pursell1-1/+1
2009-02-03add test-dump-cache-tree in MakefileGuanqun Lu2-1/+1
2009-02-03fix typo in DocumentationGuanqun Lu1-1/+1
2009-02-03bash: offer to show (un)staged changesThomas Rast1-2/+24
2009-02-03apply: fix access to an uninitialized mode variable, found by valgrindJohannes Schindelin1-1/+1
2009-02-03filter-branch: Fix fatal error on bare repositoriesEric Kidd2-13/+16
2009-02-03tests: fix test_commit() for case insensitive filesystemsJunio C Hamano1-1/+1
2009-02-03builtin-remote: make rm() use properly named variable to hold return valueJay Soffian1-5/+5
2009-02-03t3412: further simplify setting of GIT_EDITORJunio C Hamano1-4/+0
2009-02-03receive-pack: explain what to do when push updates the current branchJunio C Hamano2-18/+46
2009-02-03Merge branch 'maint'Junio C Hamano1-0/+2
2009-02-03Merge branch 'maint-1.6.0' into maintJunio C Hamano1-0/+2
2009-02-03Merge branch 'jc/maint-add-u-remove-conflicted'Junio C Hamano2-1/+69
2009-02-03Merge branch 'jk/maint-cleanup-after-exec-failure'Junio C Hamano3-10/+30
2009-02-02http-push.c: get_remote_object_url() is only used under USE_CURL_MULTIJunio C Hamano1-7/+8
2009-02-02grep: pass -I (ignore binary) down to external grepJunio C Hamano1-0/+2
2009-02-01In add --patch, Handle K,k,J,j slightly more gracefully.William Pursell1-15/+28
2009-02-01Add / command in add --patchWilliam Pursell1-1/+27
2009-02-01git-add -i/-p: Change prompt separater from slash to commaWilliam Pursell1-7/+7
2009-02-01t3412: use log|name-rev instead of log --graphThomas Rast1-26/+39
2009-02-01gitweb: Update README that gitweb works better with PATH_INFOJakub Narebski1-6/+4
2009-02-01mailinfo: cleanup extra spaces for complex 'From:'Kirill Smelkov4-8/+19
2009-01-31Merge branch 'ks/maint-mailinfo-folded'Junio C Hamano22-10/+229
2009-01-31Merge branch 'jc/maint-apply-fix'Junio C Hamano1-1/+1
2009-01-31Merge branch 'am/maint-push-doc'Junio C Hamano2-23/+34
2009-01-31Merge branch 'jc/maint-allow-uninteresting-missing'Junio C Hamano2-3/+44
2009-01-31Merge branch 'jg/tag-contains'Junio C Hamano8-38/+185
2009-01-31Merge branch 'js/maint-rebase-i-submodule'Junio C Hamano2-5/+30
2009-01-31Merge branch 'jc/maint-split-diff-metainfo'Junio C Hamano3-67/+99
2009-01-31Merge branch 'sp/runtime-prefix'Junio C Hamano21-46/+151
2009-01-31Merge branch 'jk/signal-cleanup'Junio C Hamano14-75/+197
2009-01-31Merge branch 'jg/mergetool'Junio C Hamano1-10/+8
2009-01-31Merge branch 'maint'Junio C Hamano1-3/+6
2009-01-31Merge branch 'maint-1.6.0' into maintJunio C Hamano1-3/+6
2009-01-31contrib/difftool: Don't repeat merge tool candidatesDavid Aguilar1-19/+12
2009-01-31contrib/difftool: add support for KompareMarkus Heidelberg2-7/+12
2009-01-31http-push: refactor request url creationTay Ray Chuan1-37/+27
2009-01-31merge: fix out-of-bounds memory accessRené Scharfe1-3/+6
2009-01-31mergetool: fix running mergetool in sub-directoriesCharles Bailey2-6/+5
2009-01-31mergetool: Add a test for running mergetool in a sub-directoryCharles Bailey1-19/+51
2009-01-30t3412: clean up GIT_EDITOR usageThomas Rast1-25/+13
2009-01-30git-shortlog.txt: fix example about .mailmapMichele Ballabio1-1/+1
2009-01-30git-cvsserver: run post-update hook *after* update.Stefan Karpinski1-2/+2
2009-01-30Fix 'git diff --no-index' with a non-existing symlink targetJohannes Schindelin2-1/+8
2009-01-30gitweb: align comments to codeGiuseppe Bilotta1-4/+4
2009-01-30gitweb: webserver config for PATH_INFOGiuseppe Bilotta1-0/+76
2009-01-30gitweb: make static files accessible with PATH_INFOGiuseppe Bilotta1-0/+5
2009-01-30git-cvsserver: handle CVS 'noop' command.Stefan Karpinski1-0/+1
2009-01-30fsck: check loose objects from alternate object stores by defaultJunio C Hamano2-9/+24
2009-01-30fsck: HEAD is part of refsJunio C Hamano2-5/+27
2009-01-30t0005: use SIGTERM for sigchain testJeff King2-5/+5
2009-01-29symbolic ref: refuse non-ref targets in HEADJeff King2-0/+44
2009-01-29validate_headref: tighten ref-matching to just branchesJeff King1-2/+2
2009-01-29Update draft release notes to 1.6.2Junio C Hamano1-12/+53
2009-01-29Sync with 1.6.1.2Junio C Hamano2-1/+41
2009-01-29GIT 1.6.1.2v1.6.1.2Junio C Hamano3-2/+41
2009-01-28Merge branch 'jc/maint-format-patch-o-relative' into maintJunio C Hamano2-4/+76
2009-01-28Merge branch 'bs/maint-rename-populate-filespec' into maintJunio C Hamano1-2/+7
2009-01-28Merge branch 'mh/maint-commit-color-status' into maintJunio C Hamano1-0/+6
2009-01-28Merge branch 'nd/grep-assume-unchanged' into maintJunio C Hamano2-2/+20
2009-01-28Merge branch 'jc/maint-ls-tree' into maintJunio C Hamano2-2/+13
2009-01-28Merge branch 'np/no-loosen-prune-expire-now' into maintJunio C Hamano2-3/+9
2009-01-28Merge branch 'mc/cd-p-pwd' into maintJunio C Hamano2-3/+3
2009-01-28Merge branch 'maint-1.6.0' into maintJunio C Hamano1-1/+2
2009-01-28avoid 31-bit truncation in write_loose_objectJeff King1-1/+2
2009-01-28Simplify t3412Johannes Schindelin1-21/+7
2009-01-28Simplify t3411Johannes Schindelin1-48/+17
2009-01-28Simplify t3410Johannes Schindelin1-89/+35
2009-01-28test-lib.sh: introduce test_commit() and test_merge() helpersJohannes Schindelin2-0/+43
2009-01-28lib-rebase.sh: Document what set_fake_editor() doesJohannes Schindelin1-0/+12
2009-01-28t3404 & t3411: undo copy&pasteJohannes Schindelin3-67/+44
2009-01-28add -u: do not fail to resolve a path as deletedJunio C Hamano2-1/+69
2009-01-28builtin-apply.c: do not set bogus mode in check_preimage() for deleted pathJunio C Hamano1-1/+1
2009-01-28mailinfo: tests for RFC2047 examplesKirill Smelkov14-0/+100
2009-01-28mailinfo: add explicit test for mails like '<a.u.thor@example.com> (A U Thor)'Kirill Smelkov5-1/+11
2009-01-28Merge branch 'tr/previous-branch'Junio C Hamano9-7/+324
2009-01-28Fix submodule squashing into unrelated commitJohannes Schindelin2-6/+5
2009-01-28rebase -i squashes submodule changes into unrelated commitJunio C Hamano1-0/+26
2009-01-28gitweb: check if-modified-since for feedsGiuseppe Bilotta1-1/+19
2009-01-28gitweb: last-modified time should be commiter, not authorGiuseppe Bilotta1-1/+1
2009-01-28gitweb: rss channel dateGiuseppe Bilotta1-0/+4
2009-01-28gitweb: rss feed managingEditorGiuseppe Bilotta1-1/+3
2009-01-28gitweb: feed generator metadataGiuseppe Bilotta1-0/+2
2009-01-28gitweb: channel image in rss feedGiuseppe Bilotta1-0/+10
2009-01-28git: use run_command() to execute dashed externalsJeff King1-4/+13
2009-01-28run_command(): help callers distinguish errorsJeff King1-0/+1
2009-01-28run_command(): handle missing command errors more gracefullyJeff King1-4/+14
2009-01-28Makefile: Make 'configure --with-expat=path' actually workSerge van den Boom1-1/+9
2009-01-28git: s/run_command/run_builtin/Jeff King1-2/+2
2009-01-28git-tag: Add --contains optionJake Goulding3-3/+146
2009-01-28Make has_commit() non-staticJake Goulding3-17/+19
2009-01-28Make opt_parse_with_commit() non-staticJake Goulding3-18/+20
2009-01-28revision traversal: allow UNINTERESTING objects to be missingJunio C Hamano2-3/+44
2009-01-28git-am: minor cleanupsJay Soffian1-8/+4
2009-01-28Windows: Fix intermittent failures of t7701Johannes Sixt1-7/+7
2009-01-28Merge branch 'maint'Junio C Hamano4-24/+129
2009-01-27send-pack: do not send unknown object name from ".have" to pack-objectsJunio C Hamano2-22/+127
2009-01-27Merge branch 'maint-1.6.0' into maintJunio C Hamano2-2/+2
2009-01-27test-path-utils: Fix off by one, found by valgrindJohannes Schindelin1-1/+1
2009-01-27get_sha1_basic(): fix invalid memory access, found by valgrindJohannes Schindelin1-1/+1
2009-01-27mergetool: respect autocrlf by using checkout-indexCharles Bailey2-5/+24
2009-01-27mergetool: Don't repeat merge tool candidatesJohannes Gilger1-10/+8
2009-01-27Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into jc/maint-split-diff-me...Junio C Hamano3-67/+99
2009-01-27diff.c: output correct index lines for a split diffJunio C Hamano2-66/+98
2009-01-26tests: Avoid single-shot environment export for shell function invocationJunio C Hamano2-5/+25
2009-01-26rebase -i: correctly remember --root flag across --continueJunio C Hamano2-2/+102
2009-01-26make: Remove -pthread on Darwin (it is included by cstdlib).Ted Pavlic1-0/+1
2009-01-26Mention "local convention" rule in the CodingGuidelinesNanako Shiraishi1-2/+7
2009-01-26Windows: Revert to default paths and convert them by RUNTIME_PREFIXSteffen Prohaska1-3/+1
2009-01-26Compute prefix at runtime if RUNTIME_PREFIX is setSteffen Prohaska2-0/+47
2009-01-26Modify setup_path() to only add git_exec_path() to PATHSteffen Prohaska1-3/+1
2009-01-26Add calls to git_extract_argv0_path() in programs that call git_config_*Steffen Prohaska16-0/+45
2009-01-26git_extract_argv0_path(): Move check for valid argv0 from caller to calleeSteffen Prohaska2-4/+7
2009-01-26Refactor git_set_argv0_path() to git_extract_argv0_path()Steve Haslam3-18/+19
2009-01-26Move computation of absolute paths from Makefile to runtime (in preparation f...Steffen Prohaska3-23/+36
2009-01-25Merge git://git.bogomips.org/git-svnJunio C Hamano3-12/+135
2009-01-25Documentation: rework src/dst description in git pushAnders Melchiorsen1-11/+12
2009-01-25Documentation: more git push examplesAnders Melchiorsen1-3/+13
2009-01-25Documentation: simplify refspec format descriptionJunio C Hamano2-9/+9
2009-01-25rebase -i --root: fix check for number of argumentsJohannes Schindelin1-1/+2
2009-01-25gittutorial: remove misleading noteMiklos Vajna1-3/+1
2009-01-25git-am: Add --ignore-date optionNanako Shiraishi3-1/+37
2009-01-25am: Add --committer-date-is-author-date optionJunio C Hamano2-1/+32
2009-01-25Merge branch 'kb/lstat-cache'Junio C Hamano4-67/+238
2009-01-25Merge branch 'js/diff-color-words'Junio C Hamano10-87/+492
2009-01-25Merge branch 'cb/add-pathspec'Junio C Hamano5-51/+17
2009-01-25Merge branch 'js/maint-all-implies-HEAD'Junio C Hamano6-2/+63
2009-01-25Merge branch 'sr/clone-empty'Junio C Hamano2-4/+29
2009-01-25diff-options.txt: Fix asciidoc markup issueTeemu Likonen1-1/+1
2009-01-25git-svn: Add test for --ignore-paths parameterVitaly \"_Vi\" Shukela1-0/+98
2009-01-25Sync with 1.6.1.1Junio C Hamano3-9/+20
2009-01-25git-svn: documented --ignore-pathsVitaly \"_Vi\" Shukela1-0/+13
2009-01-25git-svn: add --ignore-paths option for fetchingVitaly \"_Vi\" Shukela1-11/+22
2009-01-25git-svn: fix memory leak when checking for empty symlinksEric Wong1-1/+2
2009-01-25GIT 1.6.1.1v1.6.1.1Junio C Hamano2-8/+18
2009-01-25Ignore test-ctypeBenjamin Kramer1-0/+1
2009-01-25http-push.c: style fixesJunio C Hamano1-4/+5
2009-01-25t1505: remove debugging cruftThomas Rast1-2/+0
2009-01-23Merge branch 'js/patience-diff'Junio C Hamano10-2/+564
2009-01-23Merge branch 'maint'Junio C Hamano1-1/+1
2009-01-23http-push: refactor lock-related headers creation for curl requestsRay Chuan1-29/+39