summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2007-11-18GIT 1.5.3.6v1.5.3.6Junio C Hamano2-10/+6
2007-11-17grep -An -Bm: fix invocation of external grep commandJunio C Hamano1-3/+3
2007-11-16Update draft release notes for 1.5.3.6Junio C Hamano1-1/+32
2007-11-16Merge branch 'ds/maint-deflatebound' into maintJunio C Hamano4-1/+28
2007-11-16Fix per-directory exclude handing for "git add"Junio C Hamano2-2/+28
2007-11-16core.excludesfile clean-upJunio C Hamano7-34/+26
2007-11-16Fix t9101 test failure caused by Subversion "auto-props"Wincent Colaiuta1-1/+1
2007-11-16git-send-email: add charset header if we add encoded 'From'Jeff King1-3/+31
2007-11-14git-clean: honor core.excludesfileJunio C Hamano2-1/+19
2007-11-14Documentation: Fix man page breakage with DocBook XSL v1.72Jonas Fonseca3-3/+12
2007-11-14git-remote.txt: fix typoSergei Organov1-1/+1
2007-11-14core-tutorial.txt: Fix argument mistake in an example.Sergei Organov1-2/+2
2007-11-14replace reference to git-rm with git-reset in git-commit docJing Xue2-4/+8
2007-11-14Grammar fixes for gitattributes documentationWincent Colaiuta1-8/+9
2007-11-13Don't allow fast-import tree delta chains to exceed maximum depthShawn O. Pearce1-7/+13
2007-11-13revert/cherry-pick: allow starting from dirty work tree.Junio C Hamano1-1/+1
2007-11-13t/t3404: fix test for a bogus todo file.Junio C Hamano1-1/+1
2007-11-12Merge branch 'sp/maint-plug-traverse-commit-list-leak' into maintJunio C Hamano1-0/+7
2007-11-11for-each-ref: fix off by one read.Christian Couder1-1/+1
2007-11-11git-branch: remove mention of non-existent '-b' optionJeff King1-1/+1
2007-11-11git-svn: prevent dcommitting if the index is dirty.Benoit Sigoure2-0/+9
2007-11-11fix index-pack with packs >4GB containing deltas on 32-bit machinesNicolas Pitre1-1/+1
2007-11-11git-hash-object should honor config variablesNicolas Pitre1-0/+2
2007-11-10gitweb: correct month in date display for atom feedsVincent Zanotti1-1/+1
2007-11-10Fix memory leak in traverse_commit_listShawn O. Pearce1-0/+7
2007-11-09print warning/error/fatal messages in one shotNicolas Pitre1-3/+3
2007-11-09Start preparing for 1.5.3.6Junio C Hamano2-1/+22
2007-11-09git-send-email: Change the prompt for the subject of the initial message.Benoit Sigoure1-1/+1
2007-11-08SubmittingPatches: improve the 'Patch:' section of the checklistSergei Organov1-5/+4
2007-11-08instaweb: Minor cleanups and fixes for potential problemsJonas Fonseca1-9/+8
2007-11-08stop t1400 hiding errors in testsAlex Riesen1-1/+1
2007-11-08Makefile: add missing dependency on wt-status.hJunio C Hamano1-0/+1
2007-11-08refresh_index_quietly(): express "optional" nature of index writing betterJunio C Hamano1-9/+5
2007-11-08Fix sed string regex escaping in module_name.Ralf Wildenhues1-1/+1
2007-11-08Avoid a few unportable, needlessly nested "...`...".Ralf Wildenhues2-4/+4
2007-11-08git-mailsplit: with maildirs not only process cur/, but also new/Gerrit Pape1-16/+22
2007-11-07Improve accuracy of check for presence of deflateBound.David Symonds4-1/+28
2007-11-07Add Documentation/CodingGuidelinesJohannes Schindelin1-0/+112
2007-11-07When exec() fails include the failing command in the error messageAsk Bjørn Hansen1-1/+1
2007-11-07RelNotes-1.5.3.5: fix another typoDavid D Kilzer1-1/+1
2007-11-05Remove a couple of duplicated includeMarco Costalba2-2/+0
2007-11-05grep with unmerged indexJunio C Hamano1-1/+1
2007-11-05Merge branch 'gp/maint-diffdoc' into maintJunio C Hamano2-9/+13
2007-11-05git-daemon: fix remote port number in log entryGerrit Pape1-2/+2
2007-11-05git-svn: t9114: verify merge commit message in testEric Wong1-0/+5
2007-11-05git-svn: fix dcommit clobbering when committing a series of diffsEric Wong2-4/+100
2007-11-03RelNotes-1.5.3.5: fix typoDavid D Kilzer1-2/+2
2007-11-03Delay pager setup in git blameMike Hommey1-3/+3
2007-11-03git-cvsimport: really convert underscores in branch names to dots with -uGerrit Pape1-0/+1
2007-11-02Fixing path quoting in git-rebaseJonathan del Strother1-13/+13
2007-11-02Merge branch 'bk/maint-cvsexportcommit' into maintJunio C Hamano1-3/+10
2007-11-02Remove unecessary hard-coding of EDITOR=':' VISUAL=':' in some test suites.Kristian Høgsberg2-6/+6
2007-11-02Documentation: quote commit messages consistently.Sergei Organov3-7/+7
2007-11-02Remove escaping of '|' in manpage option sectionsJonas Fonseca2-2/+2
2007-11-01git-diff.txt: add section "output format" describing the diff formatsGerrit Pape2-9/+13
2007-11-01git-format-patch.txt: fix explanation of an example.Sergei Organov1-1/+1
2007-11-01git-filter-branch.txt: fix a typo.Sergei Organov1-1/+1
2007-11-01git-clone.txt: Improve --depth description.Ralf Wildenhues1-3/+3
2007-11-01gitweb: Update config file example for snapshot feature in gitweb/INSTALLJakub Narebski1-1/+1
2007-10-31cvsexportcommit: fix for commits that do not have parentsBrad King1-3/+10
2007-10-31GIT 1.5.3.5v1.5.3.5Junio C Hamano2-7/+1
2007-10-30Update GIT 1.5.3.5 Release NotesJunio C Hamano1-1/+7
2007-10-30git-rebase--interactive.sh: Make 3-way merge strategies work for -p.Björn Steinbrink1-0/+2
2007-10-30git-rebase--interactive.sh: Don't pass a strategy to git-cherry-pick.Björn Steinbrink1-2/+2
2007-10-30Fix --strategy parsing in git-rebase--interactive.shBjörn Steinbrink1-1/+0
2007-10-30Make merge-recursive honor diff.renamelimitLars Hjemli1-0/+6
2007-10-30cherry-pick/revert: more compact user direction messageNicolas Pitre1-1/+1
2007-10-30core-tutorial: Use new syntax for git-merge.Sergei Organov1-4/+4
2007-10-30git-merge: document but discourage the historical syntaxJunio C Hamano1-5/+6
2007-10-30Prevent send-pack from segfaulting (backport from 'master')Junio C Hamano1-1/+4
2007-10-30Documentation/git-cvsexportcommit.txt: s/mgs/msg/ in exampleMichael W. Olson1-1/+1
2007-10-29RelNotes-1.5.3.5: describe recent fixesJunio C Hamano1-0/+21
2007-10-29merge-recursive.c: mrtree in merge() is not used before setJunio C Hamano1-1/+1
2007-10-29sha1_file.c: avoid gcc signed overflow warningsJunio C Hamano1-7/+9
2007-10-29Fix a small memory leak in builtin-addBenoit Sigoure1-0/+2
2007-10-28honor the http.sslVerify option in shell scriptsAurelien Bompard2-4/+6
2007-10-26Fix generation of perl/perl.makAlex Riesen1-5/+1
2007-10-24git-remote: fix "Use of uninitialized value in string ne"Junio C Hamano1-1/+2
2007-10-21Describe more 1.5.3.5 fixes in release notesShawn O. Pearce1-0/+15
2007-10-21Fix diffcore-break total breakageLinus Torvalds2-4/+8
2007-10-21Fix directory scanner to correctly ignore files without d_typeLinus Torvalds1-14/+38
2007-10-20Merge branch 'maint' of git://repo.or.cz/git-gui into maintShawn O. Pearce4-11/+73
2007-10-20Improve receive-pack error message about funny ref creationJoakim Tjernlund1-1/+1
2007-10-20fast-import: Fix argument order to die in file_change_mJulian Phillips1-1/+1
2007-10-20git-gui: Don't display CR within console windowsgitgui-0.8.4Shawn O. Pearce1-1/+1
2007-10-20git-gui: Handle progress bars from newer gitsShawn O. Pearce1-1/+4
2007-10-20git-gui: Correctly report failures from git-write-treeShawn O. Pearce1-1/+1
2007-10-19gitk.txt: Fix markup.Ralf Wildenhues1-1/+1
2007-10-19send-pack: respect '+' on wildcard refspecsJeff King2-0/+50
2007-10-19Paper bag fix diff invocation in 'git stash show'Shawn O. Pearce1-1/+1
2007-10-19Further 1.5.3.5 fixes described in release notesShawn O. Pearce1-3/+13
2007-10-18Avoid invoking diff drivers during git-stashShawn O. Pearce1-3/+3
2007-10-18attr: fix segfault in gitattributes parsing codeSteffen Prohaska2-1/+11
2007-10-18Define NI_MAXSERV if not defined by operating systemPatrick Welche1-0/+4
2007-10-18Ensure we add directories in the correct orderAlex Bennee1-0/+11
2007-10-18Avoid scary errors about tagged trees/blobs during git-fetchLinus Torvalds1-1/+1
2007-10-18Yet more 1.5.3.5 fixes mentioned in release notesShawn O. Pearce1-0/+8
2007-10-18cvsserver: Use exit 1 instead of die when req_Root fails.Brian Gernhardt1-2/+4
2007-10-18git-blame shouldn't crash if run in an unmerged treeLinus Torvalds2-0/+75
2007-10-18git-config: print error message if the config file cannot be readGerrit Pape1-1/+4
2007-10-18fixing output of non-fast-forward output of post-receive-emailRobert Schiele1-1/+1
2007-10-16Document additional 1.5.3.5 fixes in release notesShawn O. Pearce1-0/+15
2007-10-16Avoid 'expr index' on Mac OS X as it isn't supportedShawn O. Pearce1-2/+1
2007-10-16filter-branch: update current branch when rewrittenJohannes Schindelin2-1/+18
2007-10-16fix filter-branch documentationJohannes Schindelin1-2/+1
2007-10-16helpful error message when send-pack finds no refs in common.Andrew Clausen1-1/+2
2007-10-16Fix setup_git_directory_gently() with relative GIT_DIR & GIT_WORK_TREEJohannes Schindelin2-1/+21
2007-10-16Correct typos in release notes for 1.5.3.5Shawn O. Pearce1-2/+2
2007-10-15Whip post 1.5.3.4 maintenance series into shape.Shawn O. Pearce2-1/+26
2007-10-15rebase -i: use diff plumbing instead of porcelainJohannes Schindelin1-2/+2
2007-10-15Do not remove distributed configure scriptMathias Megyei1-1/+4
2007-10-15git-archive: document --execMichele Ballabio1-1/+6
2007-10-15git-reflog: document --verboseMichele Ballabio1-1/+4
2007-10-15git-config: handle --file option with relative pathname properlyGerrit Pape1-2/+7
2007-10-15clear_commit_marks(): avoid deep recursionJohannes Schindelin1-9/+14
2007-10-15git add -i: Remove unused variablesJean-Luc Herren1-10/+6
2007-10-15git add -i: Fix parsing of abbreviated hunk headersJean-Luc Herren1-6/+5
2007-10-15git-config: don't silently ignore options after --listFrank Lichtenheld1-1/+4
2007-10-15Clean up "git log" format with DIFF_FORMAT_NO_OUTPUTLinus Torvalds3-3/+3
2007-10-15Fix embarrassing "git log --follow" bugLinus Torvalds1-2/+2
2007-10-07git-gui: accept versions containing text annotations, like 1.5.3.mingw.1Steffen Prohaska1-0/+1
2007-10-03GIT 1.5.3.4v1.5.3.4Junio C Hamano2-11/+18
2007-10-03Add test case for ls-files --with-treeCarl Worth1-0/+71
2007-10-02Must not modify the_index.cache as it may be passed to realloc at some point.Keith Packard1-1/+2
2007-10-03git-gui: Don't crash when starting gitk from a browser sessionShawn O. Pearce1-2/+8
2007-10-03git-gui: Allow gitk to be started on Cygwin with native Tcl/TkShawn O. Pearce1-0/+20
2007-10-02the ar tool is called gar on some systemsRobert Schiele1-1/+1
2007-10-02rename diff_free_filespec_data_large() to diff_free_filespec_blob()Junio C Hamano3-5/+5
2007-10-02diffcore-rename: cache file deltasJeff King3-4/+11
2007-10-02Mention 'cpio' dependency in INSTALLJohan Herland1-0/+3
2007-10-02Make git-pull complain and give advice when there is nothing to merge withFederico Mena Quintero1-4/+18
2007-10-02Note that git-branch will not automatically checkout the new branchFederico Mena Quintero1-0/+4
2007-10-02Add documentation for --track and --no-track to the git-branch docs.Federico Mena Quintero1-0/+15
2007-10-02Say when --track is useful in the git-checkout docs.Federico Mena Quintero1-1/+3
2007-10-02Fix typo in config.txtJohannes Schindelin1-1/+1
2007-10-02for-each-ref: fix %(numparent) and %(parent)Junio C Hamano1-4/+6
2007-10-02git-commit: initialize TMP_INDEX just to be sure.Junio C Hamano1-0/+1
2007-10-01fixed link in documentation of diff-optionsSteffen Prohaska1-2/+2
2007-10-01Whip post 1.5.3.3 maintenance series into shape.Junio C Hamano4-8/+30
2007-10-01git stash: document apply's --index switchMiklos Vajna1-1/+6
2007-10-01post-receive-hook: Remove the From field from the generated email header so t...Andy Parkins1-1/+0
2007-09-29git-remote: exit with non-zero status after detecting errors.Jari Aalto1-4/+10
2007-09-29rebase -i: squash should retain the authorship of the _first_ commitJohannes Schindelin3-3/+3
2007-09-29git-add--interactive: Improve behavior on bogus inputJean-Luc Herren1-4/+3
2007-09-29git-add--interactive: Allow Ctrl-D to exitJean-Luc Herren1-1/+6
2007-09-29GIT 1.5.3.3v1.5.3.3Junio C Hamano2-1/+38
2007-09-29Fix revision log diff setup, avoid unnecessary diff generationLinus Torvalds1-2/+8
2007-09-29git-bundle: fix commandline examples in the manpageMiklos Vajna1-0/+8
2007-09-29Merge branch 'mergetool' of git://repo.or.cz/git/mergetool into maintJunio C Hamano1-7/+8
2007-09-28mergetool: Fix typo in options passed to kdiff3Theodore Ts'o1-2/+2
2007-09-28mergetool: fix emerge when running in a subdirectoryTheodore Ts'o1-2/+2
2007-09-28Mergetool generating blank files (1.5.3)Junio C Hamano1-3/+4
2007-09-27quiltimport: Skip non-existent patchesDan Nicholson1-0/+4
2007-09-26apply: get rid of --index-info in favor of --build-fake-ancestorJohannes Schindelin3-21/+31
2007-09-26Move make_cache_entry() from merge-recursive.c into read-cache.cCarlos Rica3-24/+26
2007-09-25core-tutorial: correct URLRandy Dunlap1-1/+2
2007-09-25Fix spelling of overridden in documentationShawn Bohrer2-2/+2
2007-09-25gitattributes.txt: Be more to the point in the filter driver description.Johannes Sixt1-5/+4
2007-09-25gitattributes.txt: Remove a duplicated paragraph about 'ident' and 'crlf' int...Johannes Sixt1-11/+0
2007-09-25user-manual: Explain what submodules are good for.Michael Smith1-12/+42
2007-09-25Merge branch 'jn/web' into maintJunio C Hamano1-36/+2
2007-09-25Do not over-quote the -f envelopesender value.Jim Meyering1-6/+10
2007-09-25unexpected Make output (e.g. from --debug) causes build failureJim Meyering1-1/+1
2007-09-24Fixed minor typo in t/t9001-send-email.sh test command line.Glenn Rempe1-1/+1
2007-09-23gitweb: No difftree output for trivial mergeJakub Narebski1-1/+1
2007-09-23gitweb: Remove parse_from_to_diffinfo code from git_patchset_bodyJakub Narebski1-35/+1
2007-09-23Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maintJunio C Hamano1-7/+213
2007-09-23git-svn: don't attempt to spawn pager if we don't want oneEric Wong1-1/+1
2007-09-23Supplant the "while case ... break ;; esac" idiomDavid Kastrup19-23/+23
2007-09-23User Manual: add a chapter for submodulesMiklos Vajna1-0/+202
2007-09-23user-manual: don't assume refs are stored under .git/refsJ. Bruce Fields1-7/+11
2007-09-22Detect exec bit in more cases.David Brown1-1/+9
2007-09-21git-gui: Ensure .git/info/exclude is honored in Cygwin workdirsShawn O. Pearce1-3/+31
2007-09-21git-gui: Handle starting on mapped shares under CygwinShawn O. Pearce1-1/+1
2007-09-21git-gui: Display message box when we cannot find git in $PATHShawn O. Pearce1-1/+5
2007-09-21Conjugate "search" correctly in the git-prune-packed man page.Matt Kraai1-1/+1
2007-09-21Move the paragraph specifying where the .idx and .pack files should beMatt Kraai1-4/+4
2007-09-21Documentation/git-lost-found.txt: drop unnecessarily duplicated name.Junio C Hamano1-1/+1
2007-09-20git-gui: Avoid using bold text in entire gui for some fontsSimon Sasburg1-1/+1
2007-09-19GIT 1.5.3.2v1.5.3.2Junio C Hamano3-2/+60
2007-09-18Fixed update-hook example allow-users format.Väinö Järvelä1-4/+4
2007-09-18Documentation/git-svn: updated design philosophy notesEric Wong1-5/+6
2007-09-18t/t4014: test "am -3" with mode-only change.Junio C Hamano1-2/+5
2007-09-18Fix lapsus in builtin-apply.cPierre Habouzit1-1/+1
2007-09-18git-push: documentation and tests for pushing only branchesJeff King3-4/+14
2007-09-18git-svnimport: Use separate arguments in the pipe for git-rev-parseMatthias Urlichs1-1/+1
2007-09-17Document ls-files --with-tree=<tree-ish>Junio C Hamano1-1/+8
2007-09-17git-commit: partial commit of paths only removed from the indexJunio C Hamano2-3/+14
2007-09-17git-commit: Allow partial commit of file removal.Junio C Hamano3-1/+103
2007-09-17Merge branch 'jc/grep-c' into maintJunio C Hamano2-14/+80
2007-09-17Merge branch 'maint' of git://repo.or.cz/git-gui into maintJunio C Hamano8-45/+293
2007-09-17send-email: make message-id generation a bit more robustJunio C Hamano1-4/+11
2007-09-17git-apply: fix whitespace strippingJ. Bruce Fields1-3/+10
2007-09-16git-gui: Disable native platform text selection in "lists"gitgui-0.8.3Shawn O. Pearce3-9/+18
2007-09-16apply --index-info: fall back to current index for mode changesJohannes Schindelin2-2/+39
2007-09-15Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maintJunio C Hamano5-1003/+548
2007-09-15core-tutorial: minor cleanupJ. Bruce Fields1-22/+10
2007-09-15documentation: replace Discussion section by link to user-manual chapterJ. Bruce Fields3-597/+54
2007-09-15user-manual: todo updates and cleanupJ. Bruce Fields1-13/+16
2007-09-15user-manual: fix introduction to packfilesJ. Bruce Fields1-2/+2