Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge in 1.6.5.4 | Junio C Hamano | 2009-12-03 | 2 | -3/+7 |
|\ | |||||
| * | Git 1.6.5.4v1.6.5.4 | Junio C Hamano | 2009-12-03 | 1 | -1/+2 |
| * | Unconditionally set man.base.url.for.relative.links | Junio C Hamano | 2009-12-03 | 1 | -2/+5 |
* | | Merge branch 'maint' | Junio C Hamano | 2009-12-03 | 1 | -0/+4 |
|\ \ | |/ | |||||
| * | Documentation/Makefile: allow man.base.url.for.relative.link to be set from Make | Junio C Hamano | 2009-12-03 | 1 | -0/+4 |
* | | Git 1.6.6-rc1v1.6.6-rc1 | Junio C Hamano | 2009-12-02 | 1 | -1/+1 |
* | | Merge branch 'maint' | Junio C Hamano | 2009-12-02 | 1 | -0/+32 |
|\ \ | |/ | |||||
| * | Prepare for 1.6.5.4 | Junio C Hamano | 2009-12-02 | 1 | -0/+32 |
* | | Update draft release notes to 1.6.6 before -rc1 | Junio C Hamano | 2009-12-01 | 1 | -20/+67 |
* | | Merge branch 'maint' | Junio C Hamano | 2009-12-01 | 3 | -3/+3 |
|\ \ | |/ | |||||
| * | Documentation: Fix a few i.e./e.g. mix-ups | Michael J Gruber | 2009-12-01 | 2 | -2/+2 |
| * | Documentation: Document --branch option in git clone synopsis | David Soria Parra | 2009-11-30 | 1 | -1/+1 |
* | | Merge branch 'jc/pretty-lf' | Junio C Hamano | 2009-11-30 | 1 | -0/+8 |
|\ \ | |||||
| * | | Pretty-format: %[+-]x to tweak inter-item newlines | Junio C Hamano | 2009-10-04 | 1 | -0/+8 |
* | | | Merge branch 'cc/bisect-doc' | Junio C Hamano | 2009-11-30 | 3 | -0/+1364 |
|\ \ \ | |||||
| * | | | Documentation: add "Fighting regressions with git bisect" article | Christian Couder | 2009-11-08 | 3 | -0/+1364 |
* | | | | Merge branch 'em/commit-claim' | Junio C Hamano | 2009-11-30 | 1 | -1/+6 |
|\ \ \ \ | |||||
| * | | | | commit -c/-C/--amend: reset timestamp and authorship to committer with --rese... | Erick Mattos | 2009-11-04 | 1 | -1/+6 |
* | | | | | Merge branch 'jc/mailinfo-remove-brackets' | Junio C Hamano | 2009-11-30 | 1 | -1/+6 |
|\ \ \ \ \ | |||||
| * | | | | | mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker | Junio C Hamano | 2009-07-29 | 1 | -1/+6 |
* | | | | | | Merge branch 'fc/send-email-envelope' | Junio C Hamano | 2009-11-30 | 1 | -3/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | send-email: automatic envelope sender | Felipe Contreras | 2009-11-27 | 1 | -3/+4 |
* | | | | | | | Merge branch 'bw/diff-color-hunk-header' | Junio C Hamano | 2009-11-30 | 1 | -4/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Give the hunk comment its own color | Bert Wesarg | 2009-11-28 | 1 | -4/+4 |
* | | | | | | | | Update draft release notes to 1.6.6 before merging topics for -rc1 | Junio C Hamano | 2009-11-28 | 1 | -33/+100 |
|/ / / / / / / | |||||
* | | | | | | | gitworkflows: Consistently back-quote git commands | Björn Gustavsson | 2009-11-26 | 1 | -1/+1 |
* | | | | | | | t1200: fix a timing dependent error | Nanako Shiraishi | 2009-11-25 | 1 | -2/+2 |
* | | | | | | | Documentation: update descriptions of revision options related to '--bisect' | Christian Couder | 2009-11-24 | 1 | -12/+27 |
* | | | | | | | Merge branch 'rs/color-escape-has-zero-width' | Junio C Hamano | 2009-11-23 | 1 | -3/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | strbuf_add_wrapped_text(): skip over colour codes | René Scharfe | 2009-11-23 | 1 | -3/+1 |
* | | | | | | | | Merge branch 'bg/apply-doc' | Junio C Hamano | 2009-11-23 | 2 | -21/+39 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix over-simplified documentation for 'git log -z' | Björn Gustavsson | 2009-11-23 | 1 | -5/+7 |
| * | | | | | | | | apply: Use the term "working tree" consistently | Björn Gustavsson | 2009-11-22 | 1 | -2/+2 |
| * | | | | | | | | apply: Format all options using back-quotes | Björn Gustavsson | 2009-11-22 | 1 | -8/+8 |
| * | | | | | | | | apply: apply works outside a repository | Björn Gustavsson | 2009-11-22 | 1 | -3/+6 |
| * | | | | | | | | Clarify and correct -z | Björn Gustavsson | 2009-11-22 | 2 | -8/+21 |
* | | | | | | | | | Merge branch 'mm/maint-hint-failed-merge' | Junio C Hamano | 2009-11-23 | 2 | -2/+22 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | user-manual: Document that "git merge" doesn't like uncommited changes. | Matthieu Moy | 2009-11-22 | 1 | -2/+18 |
| * | | | | | | | | | merge-recursive: point the user to commit when file would be overwritten. | Matthieu Moy | 2009-11-22 | 1 | -0/+4 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jc/log-stdin' | Junio C Hamano | 2009-11-23 | 1 | -2/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Make --stdin option to "log" family read also pathspecs | Junio C Hamano | 2009-11-20 | 1 | -1/+3 |
| * | | | | | | | | | Teach --stdin option to "log" family | Junio C Hamano | 2009-11-20 | 1 | -1/+1 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'cc/replace' | Junio C Hamano | 2009-11-23 | 1 | -10/+14 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Documentation: talk a little bit about GIT_NO_REPLACE_OBJECTS | Christian Couder | 2009-11-20 | 1 | -0/+3 |
| * | | | | | | | | | Documentation: fix typos and spelling in replace documentation | Christian Couder | 2009-11-20 | 1 | -10/+11 |
* | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-11-23 | 1 | -3/+9 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| * | | | | | | | | | pack-objects: split implications of --all-progress from progress activation | Nicolas Pitre | 2009-11-23 | 1 | -3/+9 |
* | | | | | | | | | | Merge branch 'bg/fetch-multi' | Junio C Hamano | 2009-11-23 | 4 | -3/+44 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | builtin-fetch: add --dry-run option | Jay Soffian | 2009-11-10 | 1 | -0/+5 |
| * | | | | | | | | | | builtin-fetch: add --prune option | Jay Soffian | 2009-11-10 | 1 | -0/+4 |