summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* add -i: ignore terminal escape sequencesThomas Rast2011-05-171-0/+19
* Update draft release notes to 1.7.5.2Junio C Hamano2011-05-161-0/+15
* Merge branch 'jn/maint-format-patch-doc' into maintJunio C Hamano2011-05-161-0/+58
|\
| * Documentation: describe the format of messages with inline patchesJonathan Nieder2011-04-151-0/+58
* | Merge branch 'ss/cherry-pick-x-doc' into maintJunio C Hamano2011-05-161-3/+4
|\ \
| * | doc: Clarify that "cherry-pick -x" does not use "git notes"Sebastian Schuberth2011-04-151-3/+4
| |/
* | Merge branch 'vr/merge-base-doc' into maintJunio C Hamano2011-05-162-14/+23
|\ \
| * | Restructure documentation for git-merge-base.Jonathan Nieder2011-04-151-12/+16
| * | Documentation: update to git-merge-base --octopusVincent van Ravesteijn2011-04-152-2/+7
| |/
* | Merge branch 'sr/maint-fast-import-tighten-option-parsing' into maintJunio C Hamano2011-05-161-3/+3
|\ \
| * | fast-import: fix option parser for no-arg optionsSverre Rabbelier2011-05-051-3/+3
* | | Merge branch 'jc/t1506-shell-param-expansion-gotcha' into maintJunio C Hamano2011-05-161-2/+5
|\ \ \
| * | | t1507: avoid "${parameter<op>'word'}" inside double-quotesJunio C Hamano2011-05-091-2/+5
* | | | Merge branch 'jc/fix-add-u-unmerged' into maintJunio C Hamano2011-05-162-39/+30
|\ \ \ \
| * | | | Fix "add -u" that sometimes fails to resolve unmerged pathsJunio C Hamano2011-04-232-39/+30
* | | | | Merge branch 'jn/gitweb-dependency' into maintJunio C Hamano2011-05-161-27/+1
|\ \ \ \ \
| * | | | | Remove gitweb/gitweb.cgi and other legacy targets from main MakefileJakub Narebski2011-05-081-26/+0
| * | | | | git-instaweb: Simplify build dependency on gitwebJakub Narebski2011-05-081-1/+1
* | | | | | Merge branch 'jc/maint-branch-mergeoptions' into maintJunio C Hamano2011-05-162-15/+58
|\ \ \ \ \ \
| * | | | | | merge: make branch.<name>.mergeoptions correctly override merge.<option>Junio C Hamano2011-05-062-14/+57
* | | | | | | Merge branch 'jc/maint-add-p-overlapping-hunks' into maintJunio C Hamano2011-05-163-16/+54
|\ \ \ \ \ \ \
| * | | | | | | t3701: add-p-fix makes the last test to passJunio C Hamano2011-05-081-1/+1
| * | | | | | | "add -p": work-around an old laziness that does not coalesce hunksJunio C Hamano2011-04-292-4/+7
| * | | | | | | add--interactive.perl: factor out repeated --recount optionJunio C Hamano2011-04-291-8/+8
| * | | | | | | t3701: Editing a split hunk in an "add -p" sessionJunio C Hamano2011-04-291-0/+36
| * | | | | | | add -p: 'q' should really quitJunio C Hamano2011-04-291-5/+4
* | | | | | | | Documentation/git-fsck.txt: fix typo: unreadable -> unreachableJim Meyering2011-05-161-2/+2
* | | | | | | | Update draft release notes to 1.7.5.2Junio C Hamano2011-05-151-0/+9
* | | | | | | | Merge branch 'cn/format-patch-quiet' into maintJunio C Hamano2011-05-152-7/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | format-patch: document --quiet optionCarlos Martín Nieto2011-04-121-1/+4
| * | | | | | | | format-patch: don't pass on the --quiet flagCarlos Martín Nieto2011-04-121-6/+10
* | | | | | | | | Merge branch 'jm/mergetool-submodules' into maintJunio C Hamano2011-05-152-9/+371
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | mergetool: Teach about submodulesJonathon Mah2011-04-132-9/+371
* | | | | | | | | | Merge branch 'jk/format-patch-quote-special-in-from' into maintJunio C Hamano2011-05-152-1/+102
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | pretty: quote rfc822 specials in email addressesJeff King2011-04-262-1/+102
* | | | | | | | | | | Merge branch 'vh/git-svn-doc' into maintJunio C Hamano2011-05-151-11/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-svn.txt: small typeface improvementsValentin Haenel2011-04-261-4/+4
| * | | | | | | | | | | git-svn.txt: move option descriptionsValentin Haenel2011-04-261-11/+11
| * | | | | | | | | | | git-svn.txt: fix usage of --add-author-fromValentin Haenel2011-04-261-1/+1
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | git_open_noatime(): drop unused parameterJunio C Hamano2011-05-151-8/+7
* | | | | | | | | | | sha1_file: typofixJunio C Hamano2011-05-151-1/+1
* | | | | | | | | | | add, merge, diff: do not use strcasecmp to compare config variable namesJonathan Nieder2011-05-143-6/+6
* | | | | | | | | | | Prepare for 1.7.5.2Junio C Hamano2011-05-132-1/+34
* | | | | | | | | | | Merge branch 'aw/maint-rebase-i-p-no-ff' into maintJunio C Hamano2011-05-132-2/+32
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-rebase--interactive.sh: preserve-merges fails on merges created with no-ffAndrew Wong2011-04-282-2/+32
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'js/blame-parsename' into maintJunio C Hamano2011-05-133-3/+14
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t/annotate-tests: Use echo & cat instead of sedBrian Gernhardt2011-05-051-1/+2
| * | | | | | | | | | | blame: tolerate bogus e-mail addresses a bit betterJosh Stone2011-04-293-3/+13
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'gr/cvsimport-alternative-cvspass-location' into maintJunio C Hamano2011-05-131-12/+41
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Look for password in both CVS and CVSNT password files.Guy Rouillier2011-05-011-12/+41