summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2008-04-20GIT 1.5.5.1v1.5.5.1Junio C Hamano3-1/+48
2008-04-19Merge branch 'jc/maint-rebase-am' into maintJunio C Hamano2-5/+55
2008-04-18gitweb: Fix 'history' view for deleted files with historyJakub Narebski2-3/+31
2008-04-18Document that WebDAV doesn't need git on the server, and works over SSLMatthieu Moy1-12/+33
2008-04-18Merge branch 'maint-1.5.4' into maintJunio C Hamano1-1/+1
2008-04-18git-remote: reject adding remotes with invalid namesJonas Fonseca4-6/+32
2008-04-18am: POSIX portability fixJunio C Hamano1-1/+1
2008-04-16Merge branch 'maint-1.5.4' into maintJunio C Hamano2-22/+33
2008-04-16git-am: minor cleanupJunio C Hamano1-2/+1
2008-04-16Clarify and fix English in "git-rm" documentationJon Loeliger1-20/+32
2008-04-16rebase: do not munge commit log messageJunio C Hamano2-5/+55
2008-04-16Merge branch 'maint-1.5.4' into maintJunio C Hamano6-33/+54
2008-04-16git-bisect: make "start", "good" and "skip" succeed or fail atomicallyChristian Couder2-5/+16
2008-04-16git-am: cope better with an empty Subject: lineLinus Torvalds1-14/+10
2008-04-15Ignore leading empty lines while summarizing mergesLinus Torvalds1-1/+9
2008-04-15bisect: squelch "fatal: ref HEAD not a symref" misleading messageChristian Couder1-1/+1
2008-04-15builtin-apply: Show a more descriptive error on failure when opening a patchAlberto Bertogli1-1/+1
2008-04-15Clarify documentation of git-cvsserver, particularly in relation to git-shellScott Collins1-11/+17
2008-04-14git clean: Add test to verify directories aren't removed with a prefixShawn Bohrer1-2/+3
2008-04-14git clean: Don't automatically remove directories when run within subdirectoryShawn Bohrer2-7/+8
2008-04-14git-submodule - possibly use branch name to describe a moduleMark Levedahl1-1/+2
2008-04-12t7401: squelch garbage outputJunio C Hamano1-1/+1
2008-04-12Documentation/git-submodule: typofixJunio C Hamano1-1/+1
2008-04-12Fix config key miscount in url.*.insteadOfDaniel Barkalow2-5/+5
2008-04-12Merge branch 'maint-1.5.4' into maintJunio C Hamano4-5/+16
2008-04-12Docs gitk: Explicitly mention the files that gitk uses (~/.gitk)Clifford Caoile1-0/+5
2008-04-12Document -w option to shortlogJunio C Hamano2-3/+9
2008-04-12bisect: report bad rev betterChristian Couder1-2/+2
2008-04-11Merge branch 'maint-1.5.4' into maintJunio C Hamano7-13/+34
2008-04-11bisect: fix bad rev checking in "git bisect good"Christian Couder2-9/+18
2008-04-11revision.c: make --date-order overriddableMichele Ballabio1-0/+1
2008-04-11git-submodule: Avoid 'fatal: cannot describe' messagePing Yin1-1/+1
2008-04-11Force the medium pretty format on calls to git logPedro Melo1-1/+1
2008-04-11Fix section about backdating tags in the git-tag docsBjörn Steinbrink1-2/+2
2008-04-11Document option --only of git commitJohannes Sixt2-1/+12
2008-04-11Documentation/git-request-pull: Fixed a typo ("send" -> "end")Dirk Suesserott1-1/+1
2008-04-10git-fetch: fix status output when not storing tracking refJeff King1-15/+13
2008-04-10Merge branch 'maint-1.5.4' into maintJunio C Hamano7-15/+32
2008-04-10core-tutorial.txt: Fix showing the current behaviour.Carlos Rica1-6/+6
2008-04-10git-archive: ignore prefix when checking file attributeRené Scharfe3-5/+22
2008-04-10Fix documentation syntax of optional arguments in short options.Carlos Rica3-4/+4
2008-04-07GIT 1.5.5v1.5.5Junio C Hamano3-8/+7
2008-04-07Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano1-3/+3
2008-04-07git-svn: fix following renamed paths when tracking a single pathEric Wong3-2/+113
2008-04-06Merge branch 'jc/maint-apply-match-beginning'Junio C Hamano2-13/+29
2008-04-06Add prefix oriented completions for diff and format-patch commands.Pascal Obry1-1/+4
2008-04-06test suite: remove useless TERM cruft in "t7005-editor.sh"Christian Couder1-4/+0
2008-04-06Add interactive option in rebase command completion list.Pascal Obry1-1/+1
2008-04-06Fix "git apply" to correctly enforce "match at the beginning"Junio C Hamano2-13/+29
2008-04-06Add description of OFS_DELTA to the pack format descriptionPeter Eriksen1-1/+15
2008-04-06gitk: Fix changing colors through Edit->PreferencesGerrit Pape1-3/+3
2008-04-05git-pack-objects.txt: Make wording slightly less ambiguousPeter Eriksen1-2/+3
2008-04-05git-fetch: Don't trigger a bus error when given the refspec "tag"Kevin Ballard1-0/+2
2008-04-05Revert "gitweb: Add 'status_str' to parse_difftree_raw_line output"Jakub Narebski1-3/+2
2008-04-04Merge git://repo.or.cz/git-guiJunio C Hamano2-51/+45
2008-04-05git-gui: use +/- instead of ]/[ to show more/less context in diffgitgui-0.10.1Michele Ballabio1-6/+12
2008-04-04git-gui: Update french translationChristian Couder1-45/+33
2008-04-03git-gui: Switch keybindings for [ and ] to bracketleft and bracketrightShawn O. Pearce1-4/+4
2008-04-02GIT 1.5.5-rc3v1.5.5-rc3Junio C Hamano2-5/+5
2008-04-02Merge branch 'js/filter-branch'Junio C Hamano2-3/+19
2008-04-02Describe the bug in handling filenames with funny characters in 'git add -i'Teemu Likonen1-0/+6
2008-04-02Merge git://repo.or.cz/git-guiJunio C Hamano2-9/+33
2008-04-02Merge branch 'bc/mktag'Junio C Hamano2-15/+232
2008-04-02Merge branch 'pb/cvsserver'Junio C Hamano1-1/+1
2008-04-02Merge branch 'dd/cvsserver'Junio C Hamano2-19/+109
2008-04-02Merge branch 'je/cvsserver'Junio C Hamano4-31/+107
2008-04-02t7004-tag: Skip more tests if gpg is not available.Johannes Sixt1-7/+8
2008-04-02verify-tag: Clean up the temporary file if gpg cannot be started.Johannes Sixt1-1/+3
2008-04-01help: Add a missing OPT_END().Christian Couder1-0/+1
2008-04-01Accept git aliases outside a git repositoryJunio C Hamano1-1/+2
2008-04-02git-gui 0.10gitgui-0.10.0Shawn O. Pearce1-1/+1
2008-04-02git-gui: Add shortcut keys for Show More/Less ContextJonathan del Strother1-8/+32
2008-03-31mktag.c: tweak validation of tagger field and adjust test scriptBrandon Casey2-31/+86
2008-03-31filter-branch: Fix renaming a directory in the tree-filterveillette@yahoo.ca2-2/+2
2008-03-31filter-branch: Test renaming directories in a tree-filterJohannes Sixt1-2/+18
2008-03-30mktag.c: improve verification of tagger field and testsBrandon Casey2-14/+176
2008-03-30diff-files: careful when inspecting work tree itemsJunio C Hamano2-9/+14
2008-03-30diff-index: careful when inspecting work tree itemsJunio C Hamano2-15/+56
2008-03-30Add corner case tests for diff-index and diff-filesJunio C Hamano1-0/+140
2008-03-30Allow git-cvsserver database table name prefix to be specified.Josh Elsasser4-31/+107
2008-03-30Silence cpio's "N blocks" output when cloning locallyBryan Donlan1-1/+5
2008-03-30git-svn: remove redundant slashes from show-ignoreEric Wong1-1/+1
2008-03-28git-p4: Handle Windows EOLs properly after removal of p4 submit template hand...Marius Storm-Olsen1-13/+15
2008-03-27git-cvsserver: handle change type TPaolo Bonzini1-1/+1
2008-03-27GIT 1.5.5-rc2v1.5.5-rc2Junio C Hamano3-8/+3
2008-03-27GIT 1.5.4.5v1.5.4.5Junio C Hamano2-7/+1
2008-03-27cvsserver: Use the user part of the email in log and annotate resultsDamien Diederen1-4/+12
2008-03-27cvsserver: Add test for update -pDamien Diederen1-0/+18
2008-03-27cvsserver: Implement update -p (print to stdout)Damien Diederen1-12/+35
2008-03-27cvsserver: Add a few tests for 'status' commandDamien Diederen1-0/+32
2008-03-27cvsserver: Do not include status output for subdirectories if -l is passedDamien Diederen1-0/+2
2008-03-27cvsserver: Only print the file part of the filename in status headerDamien Diederen1-1/+3
2008-03-27cvsserver: Respond to the 'editors' and 'watchers' commandsDamien Diederen1-2/+7
2008-03-27builtin-prune: protect objects listed on the command lineJunio C Hamano2-3/+14
2008-03-27builtin-prune.c: use parse_options()Michele Ballabio1-22/+16
2008-03-27Add tests for git-pruneMichele Ballabio1-0/+34
2008-03-27parse-options.c: introduce OPT_DATEMichele Ballabio2-0/+11
2008-03-27Update draft release notes for 1.5.5Junio C Hamano1-1/+4
2008-03-27Merge branch 'maint'Junio C Hamano4-2/+30
2008-03-27Update draft release notes for 1.5.4.5Junio C Hamano1-1/+10
2008-03-27Merge branch 'jc/maint-fetch-regression-1.5.4' into maintJunio C Hamano70-55/+1067
2008-03-27Documentation: clarify use of .git{ignore,attributes} versus .git/info/*Jeff King2-0/+19
2008-03-27test_must_fail: 129 is a valid error code from usage()Junio C Hamano1-1/+1
2008-03-26imap-send: properly error out if imap.host is not set in configGerrit Pape1-0/+4
2008-03-26t9600-cvsimport.sh: set HOME before checking for cvsps availabilityFrank Lichtenheld1-6/+6
2008-03-26Always set *nongit_ok in setup_git_directory_gently()SZEDER Gábor8-8/+16
2008-03-26t/t3800-mktag.sh: use test_must_fail rather than '!'Brandon Casey1-2/+2
2008-03-26Merge branch 'jc/maint-fetch-regression-1.5.4'Junio C Hamano66-13/+853
2008-03-26git-fetch test: test tracking fetch results, not just FETCH_HEADJunio C Hamano65-7/+831
2008-03-26Fix branches file configurationDaniel Barkalow1-6/+22
2008-03-26Tighten refspec processingDaniel Barkalow5-42/+214
2008-03-26Fix the wrong output of `git-show v1.3.0~155^2~4` in documentation.Guanqun Lu1-1/+1
2008-03-25refspec: allow colon-less wildcard "refs/category/*"Junio C Hamano1-7/+11
2008-03-25init: show "Reinit" message even in an (existing) empty repositoryJohannes Schindelin2-2/+20
2008-03-25Documentation/git-checkout: Update summary to reflect current abilitiesJulian Phillips2-4/+7
2008-03-24Documentation: git-tag '-m'/'-F' implies '-a'Dirk Süsserott1-0/+7
2008-03-23builtin-remote: Fix missing newline at end of listing of pushed branchesJohannes Sixt2-0/+7
2008-03-23Fix the wrong output of `git-show v1.3.0~155^2~4` in documentation.Guanqun Lu1-1/+1
2008-03-23RelNotes: mention checkout/branch's --track option, tooJohannes Schindelin1-2/+3
2008-03-23GIT 1.5.5-rc1v1.5.5-rc1Junio C Hamano2-2/+5
2008-03-23gc --auto: raise default auto pack limit from 20 to 50Junio C Hamano2-2/+2
2008-03-23Merge branch 'git-p4' of git://repo.or.cz/git/git-p4Junio C Hamano1-9/+14
2008-03-22remote.c: Fix overtight refspec validationJunio C Hamano5-49/+188
2008-03-22fast-import: Document the effect of "merge" with no "from" in a commitEyvind Bernhardsen1-3/+8
2008-03-22Make git-svn tests behave better on OS XKevin Ballard1-2/+23
2008-03-22Improve description of git filter-branch.Ralf Wildenhues1-11/+12
2008-03-22t/t7003-filter-branch.sh: use test_must_fail rather than '!'Brandon Casey1-6/+6
2008-03-20Don't try and percent-escape existing percent escapes in git-svn URIsKevin Ballard2-1/+32
2008-03-19remote show: do not show symbolic refsJohannes Schindelin2-1/+14
2008-03-19Document the sendemail.smtpserverport config variableKevin Ballard1-0/+3
2008-03-19Add --reverse to the git-rev-list usage stringKevin Ballard1-0/+1
2008-03-19make it easier for people who just want to get rid of 'git gc --auto'Nicolas Pitre1-2/+9
2008-03-19builtin-gc.c: allow disabling all auto-gc'ing by assigning 0 to gc.autoBrandon Casey1-3/+3
2008-03-19Documentation/git-merge: document subtree strategy.Miklos Vajna1-0/+7
2008-03-19Fix tag followingDaniel Barkalow1-0/+16
2008-03-19Make revision limiting more robust against occasional bad commit datesLinus Torvalds2-11/+39
2008-03-18Fix t3200 configDaniel Barkalow1-10/+10
2008-03-18Tighten refspec processingDaniel Barkalow1-9/+38
2008-03-18Fix possible Solaris problem in 'checkout_entry()'Linus Torvalds1-2/+2
2008-03-18Fix read-tree not to discard errorsJunio C Hamano2-4/+7
2008-03-18Add tests to catch problems with un-unlinkable symlinksJunio C Hamano1-0/+35
2008-03-18Test: catch if trash cannot be removedJunio C Hamano1-1/+6
2008-03-18git-merge-one-file: fix longstanding stupid thinkoJunio C Hamano2-2/+49
2008-03-17Merge branch 'jc/makefile'Junio C Hamano1-150/+276
2008-03-16Don't update unchanged merge entriesLinus Torvalds2-3/+47
2008-03-16fast-import: Allow "reset" to delete a new branch without errorEyvind Bernhardsen1-0/+2
2008-03-16t1000: use "test_must_fail git frotz", not "! git frotz"Junio C Hamano1-18/+18
2008-03-16Update draft release notes for 1.5.5v1.5.5-rc0Junio C Hamano1-9/+42
2008-03-16Resurrect git-rerere to contrib/examplesJunio C Hamano1-0/+284
2008-03-16Merge branch 'maint'Junio C Hamano2-1/+54
2008-03-16Start draft ReleaseNotes for 1.5.4.5Junio C Hamano2-1/+54
2008-03-16rebase -m: do not trigger pre-commit verificationJunio C Hamano1-1/+1
2008-03-15Merge branch 'master' of git://repo.or.cz/git-guiJunio C Hamano12-2431/+3155
2008-03-16git-gui: Improve directions regarding POT update in po/READMEJunio C Hamano1-12/+50
2008-03-15git-gui: Update Japanese translationしらいしななこ1-13/+9
2008-03-15Redo "add test_cmp function for test scripts"Junio C Hamano2-2/+2
2008-03-15Merge branch 'jk/portable'Junio C Hamano70-202/+247
2008-03-15Merge branch 'py/submodule'Junio C Hamano3-8/+386
2008-03-15Merge branch 'db/diff-to-fp'Junio C Hamano3-155/+171
2008-03-15Merge branch 'cc/help'Junio C Hamano3-11/+168
2008-03-15shortlog: do not require to run from inside a git repositoryJonas Fonseca3-2/+9
2008-03-15Merge branch 'maint'Junio C Hamano7-22/+71
2008-03-15format-patch: generate MIME header as needed even when there is format.headerJunio C Hamano5-16/+57
2008-03-15Merge branch 'maint'Junio C Hamano4-16/+23
2008-03-15Make man page building quiet when DOCBOOK_XSL_172 is definedJonas Fonseca1-1/+5
2008-03-15git-new-workdir: Share SVN meta data between work dirs and the repositoryBernt Hansen1-1/+1
2008-03-14Fix recent 'unpack_trees()'-related changes breaking 'git stash'Linus Torvalds1-0/+2
2008-03-15git-gui: Adjusted Japanese translation to updated POTShawn O. Pearce1-249/+277
2008-03-15git-gui: Update Japanese translationしらいしななこ1-291/+266
2008-03-15git-gui: Don't translate the special Apple menuShawn O. Pearce2-2/+2
2008-03-15git-gui: Updated Hungarian translation (e5fba18)Miklos Vajna1-14/+9
2008-03-15git-gui: update russian translationAlex Riesen1-27/+21
2008-03-15git-gui: remove spurious "fuzzy" attributes in po/it.poMichele Ballabio1-2/+0
2008-03-14rev-parse: fix meaning of rev~ vs rev~0.Linus Torvalds1-13/+15
2008-03-14git-svn: don't blindly append '*' to branch/tags configEric Wong1-1/+2
2008-03-14t6000lib: re-fix tr portabilityJeff King1-4/+7
2008-03-14Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano3-26/+980
2008-03-14gitk: initial Italian translationMichele Ballabio1-0/+890
2008-03-14gitk: Default to using po2msg.sh if msgfmt doesn't grok --tcl, -l and -dPaul Mackerras1-0/+4
2008-03-14wt-status.c: no need for dup() dance anymoreKristian Høgsberg1-15/+2
2008-03-14Write diff output to a file in struct diff_optionsDaniel Barkalow2-140/+169
2008-03-14Documention: web--browse: add info about "browser.<tool>.cmd" config varChristian Couder2-0/+26
2008-03-14web--browse: use custom commands defined at config timeChristian Couder1-2/+13
2008-03-14Merge branch 'mr/autoconf-fread'Junio C Hamano2-0/+21
2008-03-14Merge branch 'maint'Junio C Hamano7-18/+95
2008-03-14Merge branch 'ph/maint-quiltimport' into maintJunio C Hamano1-3/+19
2008-03-13read-tree() and unpack_trees(): use consistent limitJunio C Hamano3-8/+9
2008-03-13merge-file: handle empty files gracefullyJohannes Schindelin2-3/+4
2008-03-13merge-recursive: handle file mode changesClemens Buchacher2-2/+62
2008-03-14git-gui: updated Swedish translationPeter Karlsson1-290/+375
2008-03-14git-gui: Regenerated po template and merged translations with itPeter Karlsson8-1841/+2311
2008-03-13pack-objects: proper pack time stamping with --max-pack-sizeNicolas Pitre2-0/+27
2008-03-13Minor wording changes in the keyboard descriptions in git-add --interactive.Vineet Kumar1-10/+8
2008-03-13Documentation/git-help: typofixJunio C Hamano1-1/+1
2008-03-13Update Hungarian translation. 100% completed.Miklos Vajna1-38/+102
2008-03-13t7505: use SHELL_PATH in hookJeff King1-2/+3
2008-03-13t9112: add missing #!/bin/sh headerJeff King1-0/+2
2008-03-13filter-branch: use $SHELL_PATH instead of 'sh'Jeff King2-1/+2
2008-03-13filter-branch: don't use xargs -0Jeff King1-1/+1
2008-03-13add NO_EXTERNAL_GREP build optionJeff King2-2/+16