Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add -i: ignore terminal escape sequences | Thomas Rast | 2011-05-17 | 1 | -0/+19 |
* | Update draft release notes to 1.7.5.2 | Junio C Hamano | 2011-05-16 | 1 | -0/+15 |
* | Merge branch 'jn/maint-format-patch-doc' into maint | Junio C Hamano | 2011-05-16 | 1 | -0/+58 |
|\ | |||||
| * | Documentation: describe the format of messages with inline patches | Jonathan Nieder | 2011-04-15 | 1 | -0/+58 |
* | | Merge branch 'ss/cherry-pick-x-doc' into maint | Junio C Hamano | 2011-05-16 | 1 | -3/+4 |
|\ \ | |||||
| * | | doc: Clarify that "cherry-pick -x" does not use "git notes" | Sebastian Schuberth | 2011-04-15 | 1 | -3/+4 |
| |/ | |||||
* | | Merge branch 'vr/merge-base-doc' into maint | Junio C Hamano | 2011-05-16 | 2 | -14/+23 |
|\ \ | |||||
| * | | Restructure documentation for git-merge-base. | Jonathan Nieder | 2011-04-15 | 1 | -12/+16 |
| * | | Documentation: update to git-merge-base --octopus | Vincent van Ravesteijn | 2011-04-15 | 2 | -2/+7 |
| |/ | |||||
* | | Merge branch 'sr/maint-fast-import-tighten-option-parsing' into maint | Junio C Hamano | 2011-05-16 | 1 | -3/+3 |
|\ \ | |||||
| * | | fast-import: fix option parser for no-arg options | Sverre Rabbelier | 2011-05-05 | 1 | -3/+3 |
* | | | Merge branch 'jc/t1506-shell-param-expansion-gotcha' into maint | Junio C Hamano | 2011-05-16 | 1 | -2/+5 |
|\ \ \ | |||||
| * | | | t1507: avoid "${parameter<op>'word'}" inside double-quotes | Junio C Hamano | 2011-05-09 | 1 | -2/+5 |
* | | | | Merge branch 'jc/fix-add-u-unmerged' into maint | Junio C Hamano | 2011-05-16 | 2 | -39/+30 |
|\ \ \ \ | |||||
| * | | | | Fix "add -u" that sometimes fails to resolve unmerged paths | Junio C Hamano | 2011-04-23 | 2 | -39/+30 |
* | | | | | Merge branch 'jn/gitweb-dependency' into maint | Junio C Hamano | 2011-05-16 | 1 | -27/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Remove gitweb/gitweb.cgi and other legacy targets from main Makefile | Jakub Narebski | 2011-05-08 | 1 | -26/+0 |
| * | | | | | git-instaweb: Simplify build dependency on gitweb | Jakub Narebski | 2011-05-08 | 1 | -1/+1 |
* | | | | | | Merge branch 'jc/maint-branch-mergeoptions' into maint | Junio C Hamano | 2011-05-16 | 2 | -15/+58 |
|\ \ \ \ \ \ | |||||
| * | | | | | | merge: make branch.<name>.mergeoptions correctly override merge.<option> | Junio C Hamano | 2011-05-06 | 2 | -14/+57 |
* | | | | | | | Merge branch 'jc/maint-add-p-overlapping-hunks' into maint | Junio C Hamano | 2011-05-16 | 3 | -16/+54 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t3701: add-p-fix makes the last test to pass | Junio C Hamano | 2011-05-08 | 1 | -1/+1 |
| * | | | | | | | "add -p": work-around an old laziness that does not coalesce hunks | Junio C Hamano | 2011-04-29 | 2 | -4/+7 |
| * | | | | | | | add--interactive.perl: factor out repeated --recount option | Junio C Hamano | 2011-04-29 | 1 | -8/+8 |
| * | | | | | | | t3701: Editing a split hunk in an "add -p" session | Junio C Hamano | 2011-04-29 | 1 | -0/+36 |
| * | | | | | | | add -p: 'q' should really quit | Junio C Hamano | 2011-04-29 | 1 | -5/+4 |
* | | | | | | | | Documentation/git-fsck.txt: fix typo: unreadable -> unreachable | Jim Meyering | 2011-05-16 | 1 | -2/+2 |
* | | | | | | | | Update draft release notes to 1.7.5.2 | Junio C Hamano | 2011-05-15 | 1 | -0/+9 |
* | | | | | | | | Merge branch 'cn/format-patch-quiet' into maint | Junio C Hamano | 2011-05-15 | 2 | -7/+14 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | format-patch: document --quiet option | Carlos Martín Nieto | 2011-04-12 | 1 | -1/+4 |
| * | | | | | | | | format-patch: don't pass on the --quiet flag | Carlos Martín Nieto | 2011-04-12 | 1 | -6/+10 |
* | | | | | | | | | Merge branch 'jm/mergetool-submodules' into maint | Junio C Hamano | 2011-05-15 | 2 | -9/+371 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | mergetool: Teach about submodules | Jonathon Mah | 2011-04-13 | 2 | -9/+371 |
* | | | | | | | | | | Merge branch 'jk/format-patch-quote-special-in-from' into maint | Junio C Hamano | 2011-05-15 | 2 | -1/+102 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | pretty: quote rfc822 specials in email addresses | Jeff King | 2011-04-26 | 2 | -1/+102 |
* | | | | | | | | | | | Merge branch 'vh/git-svn-doc' into maint | Junio C Hamano | 2011-05-15 | 1 | -11/+11 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | git-svn.txt: small typeface improvements | Valentin Haenel | 2011-04-26 | 1 | -4/+4 |
| * | | | | | | | | | | | git-svn.txt: move option descriptions | Valentin Haenel | 2011-04-26 | 1 | -11/+11 |
| * | | | | | | | | | | | git-svn.txt: fix usage of --add-author-from | Valentin Haenel | 2011-04-26 | 1 | -1/+1 |
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | git_open_noatime(): drop unused parameter | Junio C Hamano | 2011-05-15 | 1 | -8/+7 |
* | | | | | | | | | | | sha1_file: typofix | Junio C Hamano | 2011-05-15 | 1 | -1/+1 |
* | | | | | | | | | | | add, merge, diff: do not use strcasecmp to compare config variable names | Jonathan Nieder | 2011-05-14 | 3 | -6/+6 |
* | | | | | | | | | | | Prepare for 1.7.5.2 | Junio C Hamano | 2011-05-13 | 2 | -1/+34 |
* | | | | | | | | | | | Merge branch 'aw/maint-rebase-i-p-no-ff' into maint | Junio C Hamano | 2011-05-13 | 2 | -2/+32 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff | Andrew Wong | 2011-04-28 | 2 | -2/+32 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'js/blame-parsename' into maint | Junio C Hamano | 2011-05-13 | 3 | -3/+14 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | t/annotate-tests: Use echo & cat instead of sed | Brian Gernhardt | 2011-05-05 | 1 | -1/+2 |
| * | | | | | | | | | | | blame: tolerate bogus e-mail addresses a bit better | Josh Stone | 2011-04-29 | 3 | -3/+13 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'gr/cvsimport-alternative-cvspass-location' into maint | Junio C Hamano | 2011-05-13 | 1 | -12/+41 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Look for password in both CVS and CVSNT password files. | Guy Rouillier | 2011-05-01 | 1 | -12/+41 |