Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'maint' | Junio C Hamano | 2010-12-14 | 2 | -5/+10 |
|\ | |||||
| * | Prepare for 1.7.3.4 | Junio C Hamano | 2010-12-14 | 1 | -0/+10 |
| * | Merge branch 'ja/maint-pull-rebase-doc' into maint | Junio C Hamano | 2010-12-14 | 1 | -2/+3 |
| |\ | |||||
* | \ | Merge branch 'ja/maint-pull-rebase-doc' | Junio C Hamano | 2010-12-12 | 1 | -2/+3 |
|\ \ \ | | |/ | |/| | |||||
| * | | git-pull.txt: Mention branch.autosetuprebase | Jari Aalto | 2010-12-03 | 1 | -2/+3 |
* | | | Merge branch 'gb/web--browse' | Junio C Hamano | 2010-12-12 | 1 | -0/+6 |
|\ \ \ | |||||
| * | | | web--browse: better support for chromium | Giuseppe Bilotta | 2010-12-03 | 1 | -2/+2 |
| * | | | web--browse: support opera, seamonkey and elinks | Giuseppe Bilotta | 2010-12-03 | 1 | -0/+6 |
| |/ / | |||||
* | | | Merge branch 'js/configurable-tab' | Junio C Hamano | 2010-12-12 | 2 | -2/+7 |
|\ \ \ | |||||
| * | | | Make the tab width used for whitespace checks configurable | Johannes Sixt | 2010-12-01 | 2 | -2/+7 |
* | | | | Merge branch 'mz/rebase-i-verify' | Junio C Hamano | 2010-12-12 | 1 | -0/+4 |
|\ \ \ \ | |||||
| * | | | | rebase: support --verify | Martin von Zweigbergk | 2010-11-23 | 1 | -0/+4 |
* | | | | | Merge branch 'jk/asciidoc-update' | Junio C Hamano | 2010-12-12 | 2 | -15/+12 |
|\ \ \ \ \ | |||||
| * | | | | | docs: default to more modern toolset | Jeff King | 2010-11-24 | 2 | -15/+12 |
| |/ / / / | |||||
* | | | | | Relnotes: remove items fixed on 'maint' | Junio C Hamano | 2010-12-10 | 1 | -13/+0 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2010-12-10 | 2 | -0/+35 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Prepare for 1.7.3.4 | Junio C Hamano | 2010-12-10 | 1 | -0/+32 |
| * | | | | Add --force to git-send-email documentation | Alejandro R. Sedeño | 2010-12-10 | 1 | -0/+3 |
| * | | | | Merge branch 'jn/ignore-doc' into maint | Junio C Hamano | 2010-12-09 | 1 | -7/+23 |
| |\ \ \ \ | |||||
* | | | | | | Documentation/git.txt: update list of maintenance releases | Junio C Hamano | 2010-12-09 | 1 | -4/+8 |
* | | | | | | Merge branch 'il/remote-fd-ext' | Junio C Hamano | 2010-12-08 | 2 | -0/+184 |
|\ \ \ \ \ \ | |||||
| * | | | | | | remote-fd/ext: finishing touches after code review | Ilari Liusvaara | 2010-11-19 | 2 | -10/+10 |
| * | | | | | | git-remote-ext | Ilari Liusvaara | 2010-10-13 | 1 | -0/+125 |
| * | | | | | | git-remote-fd | Ilari Liusvaara | 2010-10-13 | 1 | -0/+59 |
* | | | | | | | Merge branch 'jk/pager-per-command' | Junio C Hamano | 2010-12-08 | 1 | -5/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | allow command-specific pagers in pager.<cmd> | Jeff King | 2010-11-17 | 1 | -5/+7 |
* | | | | | | | | Merge branch 'jh/notes-merge' | Junio C Hamano | 2010-12-08 | 2 | -4/+108 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Provide 'git merge --abort' as a synonym to 'git reset --merge' | Johan Herland | 2010-11-17 | 1 | -3/+24 |
| * | | | | | | | | Provide 'git notes get-ref' to easily retrieve current notes ref | Johan Herland | 2010-11-17 | 1 | -0/+5 |
| * | | | | | | | | git notes merge: Add another auto-resolving strategy: "cat_sort_uniq" | Johan Herland | 2010-11-17 | 1 | -1/+11 |
| * | | | | | | | | git notes merge: Manual conflict resolution, part 2/2 | Johan Herland | 2010-11-17 | 1 | -0/+22 |
| * | | | | | | | | git notes merge: Manual conflict resolution, part 1/2 | Johan Herland | 2010-11-17 | 1 | -3/+7 |
| * | | | | | | | | Documentation: Preliminary docs on 'git notes merge' | Johan Herland | 2010-11-17 | 1 | -1/+43 |
* | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-12-07 | 1 | -6/+6 |
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
| * | | | | | | | | git-rm.txt: Fix quoting | Michael J Gruber | 2010-12-07 | 1 | -6/+6 |
* | | | | | | | | | Merge branch 'jn/ignore-doc' | Junio C Hamano | 2010-12-03 | 1 | -7/+23 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | |||||
| * | | | | | | | | Documentation: point to related commands from gitignore | Jonathan Nieder | 2010-11-11 | 1 | -5/+19 |
| * | | | | | | | | Documentation: split gitignore page into sections | Jonathan Nieder | 2010-11-11 | 1 | -2/+4 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'pn/commit-autosquash' | Junio C Hamano | 2010-12-03 | 1 | -4/+17 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | commit: --squash option for use with rebase --autosquash | Pat Notz | 2010-11-04 | 1 | -1/+8 |
| * | | | | | | | | commit: --fixup option for use with rebase --autosquash | Pat Notz | 2010-11-04 | 1 | -4/+10 |
* | | | | | | | | | Merge branch 'sn/diff-doc' | Junio C Hamano | 2010-12-03 | 3 | -5/+63 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | docs: clarify git diff modes of operation | Jeff King | 2010-11-05 | 2 | -4/+10 |
| * | | | | | | | | | diff,difftool: Don't use the {0,2} notation in usage strings | Štěpán Němec | 2010-11-05 | 2 | -2/+2 |
| * | | | | | | | | | CodingGuidelines: Add a section on writing documentation | Štěpán Němec | 2010-11-05 | 1 | -0/+52 |
* | | | | | | | | | | Merge branch 'jc/abbrev-guard' | Junio C Hamano | 2010-12-03 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | core.abbrevguard: Ensure short object names stay unique a bit longer | Junio C Hamano | 2010-10-28 | 1 | -0/+9 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'maint' to sync with Git 1.7.3.3 | Junio C Hamano | 2010-12-03 | 3 | -4/+16 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Git 1.7.3.3v1.7.3.3 | Junio C Hamano | 2010-12-03 | 1 | -2/+10 |
| * | | | | | | | | | CodingGuidelines: mention whitespace preferences for shell scripts | Giuseppe Bilotta | 2010-12-03 | 1 | -0/+4 |