summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2009-02-15git-svn: Fix for rewriteRoot URL containing username.v1.6.2-rc1Dévai Tamás1-0/+1
2009-02-15builtin-receive-pack.c: fix compiler warnings about format stringRené Scharfe1-2/+2
2009-02-15RelNotes UpdateJunio C Hamano1-4/+26
2009-02-15Merge branch 'mc/setup-cd-p'Junio C Hamano2-23/+10
2009-02-15Merge branch 'ff/submodule-no-fetch'Junio C Hamano2-4/+22
2009-02-15Merge branch 'ms/mailmap'Junio C Hamano15-130/+644
2009-02-15Merge branch 'jn/gitweb-committag'Junio C Hamano1-1/+1
2009-02-15Merge branch 'rc/http-push'Junio C Hamano2-2/+18
2009-02-15use a hash of the lock token as the suffix for PUT/MOVETay Ray Chuan2-2/+18
2009-02-15Merge branch 'js/gc-prune'Junio C Hamano3-8/+59
2009-02-15Merge branch 'tr/abbrev-commit-no-ellipses'Junio C Hamano16-21/+19
2009-02-15Merge branch 'jc/branch-previous'Junio C Hamano4-20/+94
2009-02-14bash: fix misspelled 'git svn' optionSZEDER Gábor1-1/+1
2009-02-14t1500: more 'git rev-parse --git-dir' testsSZEDER Gábor1-3/+3
2009-02-14Move 'rev-parse --git-dir' test to t1500SZEDER Gábor2-9/+9
2009-02-14Documentation: pruning recipe for destructive filter-branchThomas Rast1-0/+41
2009-02-14gc: make --prune useful again by accepting an optional parameterJohannes Schindelin3-8/+59
2009-02-13Teach @{-1} to git mergeJunio C Hamano2-3/+35
2009-02-13Teach the "@{-1} syntax to "git branch"Junio C Hamano3-17/+59
2009-02-13symbolic-ref: allow refs/<whatever> in HEADJeff King2-7/+2
2009-02-13Remove redundant bit clears from diff_setup()Keith Cascio1-3/+0
2009-02-13log: do not print ellipses with --abbrev-commitThomas Rast16-21/+19
2009-02-13bash-completion: Complete the values of color.interactive, color.ui, color.pagerMatt Kraai1-1/+5
2009-02-12Install the default "master" branch configuration after cloning a voidJunio C Hamano2-5/+33
2009-02-12Update documentation to add further information about using Thunderbird with ...Jeremy White2-0/+41
2009-02-12git-rebase.txt: --interactive does not work with --whitespaceMark Burton1-0/+1
2009-02-12Add 'rm -f' equivalent to 'git rm' example of filter-branch --index-filterJacob Helwig1-0/+5
2009-02-12Revert "validate_headref: tighten ref-matching to just branches"Junio C Hamano1-2/+2
2009-02-12Bugfix: GIT_EXTERNAL_DIFF with more than one changed filesNazri Ramliy2-4/+12
2009-02-11Merge branch 'maint'Junio C Hamano4-20/+88
2009-02-11Prepare for 1.6.1.4.Junio C Hamano2-1/+20
2009-02-11Merge branch 'maint-1.6.0' into maintJunio C Hamano3-20/+69
2009-02-11Make repack less likely to corrupt repositoryJunio C Hamano1-20/+67
2009-02-11fast-export: ensure we traverse commits in topological orderElijah Newren1-0/+1
2009-02-11filter-branch: Add more error-handlingEric Kidd2-12/+18
2009-02-11Fix contrib/hooks/post-receive-email for new duplicate branchPat Notz1-1/+3
2009-02-11Clear the delta base cache if a pack is rebuiltShawn O. Pearce1-0/+1
2009-02-11Merge git://git.bogomips.org/git-svnJunio C Hamano5-21/+279
2009-02-11Squelch overzealous "ignoring dangling symref" in an empty repositoryJunio C Hamano1-1/+2
2009-02-11test case for regression caused by git-svn empty symlink fixAnton Gyllenberg2-0/+208
2009-02-11git-svn: fix broken symlink workaround when switching branchesEric Wong1-5/+6
2009-02-11git-svn: Print revision while searching for earliest use of pathDeskin Miller1-0/+3
2009-02-11git-svn: abstract out a block into new method other_gs()Sam Vilain1-16/+24
2009-02-11git-svn: allow disabling expensive broken symlink checksEric Wong3-0/+38
2009-02-11Merge branch 'maint'Junio C Hamano2-2/+43
2009-02-11Merge branch 'maint-1.5.6' into maintJunio C Hamano2-2/+43
2009-02-11Merge branch 'maint-1.5.5' into maint-1.5.6Junio C Hamano2-2/+43
2009-02-11Merge branch 'maint-1.5.4' into maint-1.5.5Junio C Hamano2-2/+43
2009-02-11revision traversal and pack: notice and die on missing commitJunio C Hamano2-2/+43
2009-02-10builtin-receive-pack.c: do not initialize statics to 0Junio C Hamano1-2/+2
2009-02-10receive-pack: receive.denyDeleteCurrentJunio C Hamano2-11/+74
2009-02-10Drop double-semicolon in CJunio C Hamano4-4/+4
2009-02-10Warn use of "origin" when remotes/origin/HEAD is danglingJunio C Hamano2-2/+10
2009-02-10remote prune: warn dangling symrefsJunio C Hamano4-18/+86
2009-02-10Fix the installation path for html documentationMichael J Gruber1-1/+1
2009-02-10Generalize and libify index_is_dirty() to index_differs_from(...)Stephan Beyer4-23/+20
2009-02-10Makefile: resort filenames alphabeticallyStephan Beyer1-8/+8
2009-02-10Modernize t5400 test scriptJunio C Hamano1-86/+94
2009-02-10Describe notable git.el changes in the release notesAlexandre Julliard1-2/+3
2009-02-10Revert "Merge branch 'js/notes'"Junio C Hamano16-506/+0
2009-02-10Merge branch 'lh/submodule-tree-traversal' (early part)Junio C Hamano4-9/+32
2009-02-10Merge branch 'js/git-submodule-trailing-slash'Junio C Hamano3-2/+34
2009-02-10Merge branch 'js/maint-1.6.0-path-normalize'Junio C Hamano6-152/+115
2009-02-10Merge branch 'maint'Junio C Hamano3-0/+9
2009-02-10Merge branch 'maint-1.6.0' into maintJunio C Hamano3-0/+9
2009-02-10Clear the delta base cache during fast-import checkpointShawn O. Pearce3-0/+9
2009-02-09git-web--browse: Fix check for /bin/startTodd Zullinger1-1/+1
2009-02-08Merge branch 'maint'Junio C Hamano3-3/+28
2009-02-08completion: Get rid of tabbed indentation in comments. Replace with spaces.Ted Pavlic1-5/+5
2009-02-08completion: Fix GIT_PS1_SHOWDIRTYSTATE to prevent unbound variable errors.Ted Pavlic1-1/+1
2009-02-08gitweb: add $prevent_xss option to prevent XSS by repository contentMatt McCutchen2-3/+27
2009-02-08doc/bundle: Use the more conventional suffix '.bundle'Santi Béjar1-7/+7
2009-02-08Add two extra tests for git rebaseJohannes Schindelin1-1/+12
2009-02-08Documentation: clarify commits affected by gitk --mergeSitaram Chamarty1-1/+2
2009-02-08add -p: get rid of Git.pm warnings about unitialized valuesStephan Beyer1-1/+2
2009-02-08rev-list: fix showing distance when using --bisect-allChristian Couder1-0/+1
2009-02-08Move mailmap documentation into separate fileMarius Storm-Olsen4-84/+94
2009-02-08Change current mailmap usage to do matching on both name and email of author/...Marius Storm-Olsen5-51/+186
2009-02-08Add map_user() and clear_mailmap() to mailmapMarius Storm-Olsen3-51/+236
2009-02-08Add find_insert_index, insert_at_index and clear_func functions to string_listMarius Storm-Olsen2-4/+48
2009-02-08Add mailmap.file as configurational option for mailmap locationMarius Storm-Olsen10-7/+147
2009-02-07gitweb: Better regexp for SHA-1 committag matchJakub Narebski1-1/+1
2009-02-07submodule: warn about non-submodulesJohannes Schindelin2-1/+8
2009-02-07Let ls-files strip trailing slashes in submodules' pathsJohannes Schindelin2-1/+26
2009-02-07Remove unused normalize_absolute_path()Johannes Sixt2-46/+6
2009-02-07Test and fix normalize_path_copy()Johannes Sixt3-30/+26
2009-02-07Fix GIT_CEILING_DIRECTORIES on WindowsRené Scharfe2-8/+9
2009-02-07Move sanitary_path_copy() to path.c and rename it to normalize_path_copy()Johannes Sixt3-87/+88
2009-02-07Make test-path-utils more robust against incorrect useJohannes Sixt1-1/+6
2009-02-07tree.c: allow read_tree_recursive() to traverse gitlink entriesLars Hjemli4-9/+32
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-07git-sh-setup: Use "cd" option, not /bin/pwd, for symlinked work treeMarcel M. Cary2-23/+10
2009-02-07submodule: add --no-fetch parameter to update commandFabian Franz2-4/+22
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