summaryrefslogtreecommitdiffstats
path: root/Documentation (follow)
Commit message (Expand)AuthorAgeFilesLines
* Update draft release notes to 1.8.4Junio C Hamano2013-07-111-3/+76
* Merge branch 'pb/stash-refuse-to-kill'Junio C Hamano2013-07-111-2/+10
|\
| * git stash: avoid data loss when "git stash save" kills a directoryPetr Baudis2013-07-011-2/+10
* | Merge branch 'jg/status-config'Junio C Hamano2013-07-111-0/+8
|\ \
| * | status: introduce status.branch to enable --branch by defaultJorge Juan Garcia Garcia2013-06-241-0/+4
| * | status: introduce status.short to enable --short by defaultJorge Juan Garcia Garcia2013-06-241-0/+4
* | | Merge branch 'jc/triangle-push-fixup'Junio C Hamano2013-07-111-30/+50
|\ \ \
| * | | push: change `simple` to accommodate triangular workflowsRamkumar Ramachandra2013-06-241-3/+7
| * | | config doc: rewrite push.default sectionRamkumar Ramachandra2013-06-241-28/+44
* | | | Merge branch 'maint'Junio C Hamano2013-07-042-1/+16
|\ \ \ \
| * | | | Update draft release notes to 1.8.3.3Junio C Hamano2013-07-041-0/+15
| * | | | Merge branch 'rr/diffcore-pickaxe-doc' into maintJunio C Hamano2013-07-042-26/+57
| |\ \ \ \
| * \ \ \ \ Merge branch 'cr/git-work-tree-sans-git-dir' into maintJunio C Hamano2013-07-041-3/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'rh/merge-options-doc-fix' into maintJunio C Hamano2013-07-041-1/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'an/diff-index-doc' into maintJunio C Hamano2013-07-041-6/+6
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'maint-1.8.2' into maintJunio C Hamano2013-07-041-1/+1
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'maint-1.8.1' into maint-1.8.2Junio C Hamano2013-07-041-1/+1
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | git-config: update doc for --get with multiple valuesJohn Keeping2013-07-031-1/+1
* | | | | | | | | | | Update draft release notes to 1.8.4Junio C Hamano2013-07-011-0/+16
* | | | | | | | | | | Merge branch 'rr/remote-branch-config-refresh'Junio C Hamano2013-07-011-6/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | ls-remote doc: don't encourage use of branches-fileRamkumar Ramachandra2013-06-231-2/+2
| * | | | | | | | | | | ls-remote doc: rewrite <repository> paragraphRamkumar Ramachandra2013-06-231-3/+3
| * | | | | | | | | | | ls-remote doc: fix example invocation on git.gitRamkumar Ramachandra2013-06-231-1/+0
* | | | | | | | | | | | Merge branch 'ap/rebase-multiple-fixups'Junio C Hamano2013-07-011-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | rebase -i: handle fixup! fixup! in --autosquashAndrew Pimlott2013-06-271-1/+3
* | | | | | | | | | | | | Merge branch 'kb/am-deprecate-resolved'Junio C Hamano2013-07-012-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | am: replace uses of --resolved with --continueKevin Bracey2013-06-272-3/+3
* | | | | | | | | | | | | | Merge branch 'rr/column-doc'Junio C Hamano2013-07-011-3/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | column doc: rewrite documentation for column.uiRamkumar Ramachandra2013-06-261-3/+17
* | | | | | | | | | | | | | | Merge branch 'ft/doc-git-transport'Junio C Hamano2013-07-011-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | documentation: add git:// transport security noticeFraser Tweedale2013-06-261-0/+3
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'wk/doc-in-linux-3.x-era'Junio C Hamano2013-07-015-40/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Documentation: Update 'linux-2.6.git' -> 'linux.git'W. Trevor King2013-06-234-10/+10
| * | | | | | | | | | | | | | | Documentation: Update the NFS remote examples to use the staging repoW. Trevor King2013-06-232-19/+32
| * | | | | | | | | | | | | | | doc/clone: Pick more compelling paths for the --reference exampleW. Trevor King2013-06-231-4/+4
| * | | | | | | | | | | | | | | doc/clone: Remove the '--bare -l -s' exampleW. Trevor King2013-06-231-7/+0
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jc/topo-author-date-sort'Junio C Hamano2013-07-011-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | log: --author-date-orderJunio C Hamano2013-06-121-0/+4
* | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2013-07-012-1/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Start preparing for 1.8.3.3Junio C Hamano2013-07-011-0/+11
| * | | | | | | | | | | | | | | check-ignore doc: fix broken link to ls-files pageRamkumar Ramachandra2013-06-301-1/+1
* | | | | | | | | | | | | | | | Update draft release notes to 1.8.4Junio C Hamano2013-07-011-0/+23
* | | | | | | | | | | | | | | | Merge branch 'ap/diff-ignore-blank-lines'Junio C Hamano2013-07-011-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | diff: add --ignore-blank-lines optionAntoine Pelisse2013-06-201-0/+3
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'nk/name-rev-abbreviated-refs'Junio C Hamano2013-07-011-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | name-rev: allow to specify a subpath for --refs optionNamhyung Kim2013-06-181-1/+2
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'jk/submodule-subdirectory-ok'Junio C Hamano2013-07-011-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | rev-parse: add --prefix optionJohn Keeping2013-06-171-0/+16
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Sync with 1.8.3.2Junio C Hamano2013-06-282-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Git 1.8.3.2v1.8.3.2Junio C Hamano2013-06-282-1/+7