aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Git 1.6.6-rc1v1.6.6-rc1Gravatar Junio C Hamano 2009-12-022-2/+2
* git-pull.sh: Fix call to git-merge for new command formatGravatar Horst H. von Brand 2009-12-021-3/+3
* Merge branch 'maint'Gravatar Junio C Hamano 2009-12-023-12/+43
|\
| * Prepare for 1.6.5.4Gravatar Junio C Hamano 2009-12-022-1/+33
| * merge: do not add standard message when message is given with -m optionGravatar Junio C Hamano 2009-12-022-11/+10
| * Do not misidentify "git merge foo HEAD" as an old-style invocationGravatar Junio C Hamano 2009-12-021-1/+1
* | Update draft release notes to 1.6.6 before -rc1Gravatar Junio C Hamano 2009-12-011-20/+67
* | Merge branch 'maint'Gravatar Junio C Hamano 2009-12-014-6/+6
|\|
| * help: Do not unnecessarily look for a repositoryGravatar David Aguilar 2009-12-011-3/+3
| * Documentation: Fix a few i.e./e.g. mix-upsGravatar Michael J Gruber 2009-12-012-2/+2
| * Documentation: Document --branch option in git clone synopsisGravatar David Soria Parra 2009-11-301-1/+1
* | Merge branch 'jc/deprecate-old-syntax-from-merge'Gravatar Junio C Hamano 2009-12-011-0/+6
|\ \
| * | git-merge: a deprecation notice of the ancient command line syntaxGravatar Junio C Hamano 2009-12-011-0/+6
* | | Merge branch 'bw/remote-get-ref-states-fix'Gravatar Junio C Hamano 2009-12-011-2/+4
|\ \ \
| * | | get_ref_states: strdup entries and free util in stale listGravatar Bert Wesarg 2009-12-011-2/+4
* | | | Merge branch 'jn/gitweb-blame'Gravatar Junio C Hamano 2009-12-016-88/+1173
|\ \ \ \
| * | | | gitweb: Add link to other blame implementation in blame viewsGravatar Jakub Narebski 2009-12-011-0/+11
| * | | | gitweb: Make linking to actions requiring JavaScript a featureGravatar Jakub Narebski 2009-11-301-1/+8
| * | | | gitweb.js: fix padLeftStr() and its usageGravatar Stephen Boyd 2009-11-251-5/+5
| * | | | gitweb.js: Harden setting blamed commit info in incremental blameGravatar Jakub Narebski 2009-11-251-1/+6
| * | | | gitweb.js: fix null object exception in initials calculationGravatar Stephen Boyd 2009-11-191-2/+5
| * | | | gitweb: Minify gitweb.js if JSMIN is definedGravatar Jakub Narebski 2009-09-011-0/+20
| * | | | gitweb: Create links leading to 'blame_incremental' using JavaScriptGravatar Jakub Narebski 2009-09-012-9/+53
| * | | | gitweb: Colorize 'blame_incremental' view during processingGravatar Jakub Narebski 2009-09-012-3/+110
| * | | | gitweb: Incremental blame (using JavaScript)Gravatar Jakub Narebski 2009-09-016-88/+940
| * | | | gitweb: Add optional "time to generate page" info in footerGravatar Jakub Narebski 2009-09-012-0/+36
* | | | | Merge branch 'fc/maint-format-patch-pathspec-dashes'Gravatar Junio C Hamano 2009-11-302-1/+7
|\ \ \ \ \
| * | | | | format-patch: add test for parsing of "--"Gravatar Felipe Contreras 2009-11-261-0/+5
| * | | | | format-patch: fix parsing of "--" on the command lineGravatar Felipe Contreras 2009-11-261-1/+2
| | |_|/ / | |/| | |
* | | | | Merge branch 'mm/maint-merge-ff-error-message-fix'Gravatar Junio C Hamano 2009-11-303-18/+27
|\ \ \ \ \
| * | | | | builtin-merge: show user-friendly error messages for fast-forward too.Gravatar Matthieu Moy 2009-11-291-0/+1
| * | | | | merge-recursive: make the error-message generation an extern functionGravatar Matthieu Moy 2009-11-292-13/+21
| |/ / / /
* | | | | Merge branch 'ap/maint-merge-strategy-list-fix'Gravatar Junio C Hamano 2009-11-301-1/+1
|\ \ \ \ \
| * | | | | builtin-merge.c: call exclude_cmds() correctly.Gravatar Avery Pennarun 2009-11-291-1/+1
| |/ / / /
* | | | | Merge branch 'jc/pretty-lf'Gravatar Junio C Hamano 2009-11-303-2/+70
|\ \ \ \ \
| * | | | | Pretty-format: %[+-]x to tweak inter-item newlinesGravatar Junio C Hamano 2009-10-043-2/+70
* | | | | | Merge branch 'cc/bisect-doc'Gravatar Junio C Hamano 2009-11-303-0/+1364
|\ \ \ \ \ \
| * | | | | | Documentation: add "Fighting regressions with git bisect" articleGravatar Christian Couder 2009-11-083-0/+1364
* | | | | | | Merge branch 'em/commit-claim'Gravatar Junio C Hamano 2009-11-303-4/+129
|\ \ \ \ \ \ \
| * | | | | | | commit -c/-C/--amend: reset timestamp and authorship to committer with --rese...Gravatar Erick Mattos 2009-11-043-4/+129
* | | | | | | | Merge branch 'jc/mailinfo-remove-brackets'Gravatar Junio C Hamano 2009-11-302-21/+35
|\ \ \ \ \ \ \ \
| * | | | | | | | mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] markerGravatar Junio C Hamano 2009-07-292-21/+35
* | | | | | | | | Merge branch 'fc/send-email-envelope'Gravatar Junio C Hamano 2009-11-303-4/+41
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | send-email: automatic envelope senderGravatar Felipe Contreras 2009-11-273-4/+24
| * | | | | | | | | t9001: test --envelope-sender option of send-emailGravatar Junio C Hamano 2009-11-221-0/+17
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'uk/maint-shortlog-encoding'Gravatar Junio C Hamano 2009-11-302-8/+39
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | shortlog: respect commit encodingGravatar Uwe Kleine-K├Ânig 2009-11-252-9/+39
| |/ / / / / / / /
* | | | | | | | | Merge branch 'ns/send-email-no-chain-reply-to'Gravatar Junio C Hamano 2009-11-302-2/+66
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | prepare send-email for smoother change of --chain-reply-to defaultGravatar Nanako Shiraishi 2009-11-292-2/+66
* | | | | | | | | | Merge branch 'jc/maint-am-keep'Gravatar Junio C Hamano 2009-11-301-5/+6
|\ \ \ \ \ \ \ \ \ \