Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'yd/doc-is-in-asciidoc' | Junio C Hamano | 2013-03-28 | 1 | -0/+3 |
|\ | |||||
| * | CodingGuidelines: our documents are in AsciiDoc | Junio C Hamano | 2013-03-21 | 1 | -0/+3 |
* | | Merge branch 'yd/doc-merge-annotated-tag' | Junio C Hamano | 2013-03-28 | 2 | -1/+26 |
|\ \ | |||||
| * | | Documentation: merging a tag is a special case | Junio C Hamano | 2013-03-21 | 2 | -1/+26 |
* | | | Merge branch 'jk/difftool-dir-diff-edit-fix' | Junio C Hamano | 2013-03-28 | 1 | -3/+5 |
|\ \ \ | |||||
| * | | | difftool --dir-diff: symlink all files matching the working tree | John Keeping | 2013-03-14 | 1 | -1/+3 |
| * | | | git-difftool(1): fix formatting of --symlink description | John Keeping | 2013-03-14 | 1 | -2/+2 |
* | | | | Merge branch 'maint' | Junio C Hamano | 2013-03-28 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'maint-1.8.1' into maint | Junio C Hamano | 2013-03-28 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | git help config: s/insn/instruction/ | Matthias Krüger | 2013-03-28 | 1 | -1/+1 |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2013-03-27 | 3 | -1/+6 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | More fixes for 1.8.2.1 | Junio C Hamano | 2013-03-27 | 1 | -0/+3 |
| * | | | | | Merge branch 'maint-1.8.1' into maint | Junio C Hamano | 2013-03-27 | 2 | -1/+3 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | git-commit doc: describe use of multiple `-m` options | Christian Helmuth | 2013-03-27 | 1 | -0/+2 |
| | * | | | | git-pull doc: fix grammo ("conflicts" is plural) | Mihai Capotă | 2013-03-27 | 1 | -1/+1 |
* | | | | | | More topics from the second batch for 1.8.3 | Junio C Hamano | 2013-03-26 | 1 | -14/+8 |
* | | | | | | Merge branch 'kb/p4merge' | Junio C Hamano | 2013-03-26 | 1 | -0/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | mergetools/p4merge: create a base if none available | Kevin Bracey | 2013-03-13 | 1 | -0/+6 |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2013-03-26 | 2 | -3/+45 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | More corrections for 1.8.2.1 | Junio C Hamano | 2013-03-26 | 1 | -0/+39 |
| * | | | | | | Merge branch 'maint-1.8.1' into maint | Junio C Hamano | 2013-03-26 | 1 | -3/+6 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | Correct the docs about GIT_SSH. | Dan Bornstein | 2013-03-26 | 1 | -3/+6 |
| * | | | | | | Merge branch 'jc/maint-push-refspec-default-doc' into maint | Junio C Hamano | 2013-03-26 | 1 | -9/+14 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'wk/user-manual-literal-format' into maint | Junio C Hamano | 2013-03-26 | 1 | -142/+144 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'gp/avoid-explicit-mention-of-dot-git-refs' into maint | Junio C Hamano | 2013-03-26 | 2 | -5/+6 |
| |\ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | Second wave of topics toward 1.8.3 | Junio C Hamano | 2013-03-25 | 1 | -7/+58 |
* | | | | | | | | | | Merge branch 'jc/push-follow-tag' | Junio C Hamano | 2013-03-25 | 1 | -1/+7 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | push: --follow-tags | Junio C Hamano | 2013-03-05 | 1 | -1/+7 |
* | | | | | | | | | | | Merge branch 'jl/submodule-deinit' | Junio C Hamano | 2013-03-25 | 2 | -1/+21 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | submodule: add 'deinit' command | Jens Lehmann | 2013-03-04 | 2 | -1/+21 |
* | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2013-03-25 | 1 | -0/+29 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Start preparing for 1.8.2.1 | Junio C Hamano | 2013-03-25 | 1 | -0/+29 |
| * | | | | | | | | | | | Merge branch 'maint-1.8.1' into maint | Junio C Hamano | 2013-03-25 | 6 | -13/+47 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | / | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'tk/doc-filter-branch' into maint-1.8.1 | Junio C Hamano | 2013-03-25 | 1 | -2/+25 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'gp/describe-match-uses-glob-pattern' into maint-1.8.1 | Junio C Hamano | 2013-03-25 | 1 | -2/+3 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/doc-index-format' into maint-1.8.1 | Junio C Hamano | 2013-03-25 | 2 | -4/+12 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'wk/doc-pre-rebase' into maint-1.8.1 | Junio C Hamano | 2013-03-25 | 1 | -3/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/color-diff-doc' into maint-1.8.1 | Junio C Hamano | 2013-03-25 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | | | | | Update draft release notes to 1.8.3 | Junio C Hamano | 2013-03-21 | 1 | -0/+76 |
* | | | | | | | | | | | | | | | | Merge branch 'mn/send-email-works-with-credential' | Junio C Hamano | 2013-03-21 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | git-send-email: use git credential to obtain password | Michal Nazarewicz | 2013-02-27 | 1 | -2/+2 |
* | | | | | | | | | | | | | | | | | Merge branch 'mg/gpg-interface-using-status' | Junio C Hamano | 2013-03-21 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | pretty: make %GK output the signing key for signed commits | Michael J Gruber | 2013-02-14 | 1 | -0/+1 |
* | | | | | | | | | | | | | | | | | | Merge branch 'bc/commit-complete-lines-given-via-m-option' | Junio C Hamano | 2013-03-21 | 1 | -10/+19 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | Documentation/git-commit.txt: rework the --cleanup section | Brandon Casey | 2013-02-19 | 1 | -10/+19 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'nd/count-garbage' | Junio C Hamano | 2013-03-21 | 1 | -5/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | count-objects: report how much disk space taken by garbage files | Nguyễn Thái Ngọc Duy | 2013-02-15 | 1 | -0/+2 |
| * | | | | | | | | | | | | | | | | | | | count-objects: report garbage files in pack directory too | Nguyễn Thái Ngọc Duy | 2013-02-15 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | | | | | | git-count-objects.txt: describe each line in -v output | Nguyễn Thái Ngọc Duy | 2013-02-08 | 1 | -5/+15 |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/fetch-raw-sha1' | Junio C Hamano | 2013-03-21 | 1 | -1/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |