summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Junio C Hamano2013-06-302-1/+12
|\
| * Start preparing for 1.8.3.3Junio C Hamano2013-06-301-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-06-301-0/+23
* | Merge branch 'ap/diff-ignore-blank-lines'Junio C Hamano2013-06-301-0/+3
|\ \
| * | diff: add --ignore-blank-lines optionAntoine Pelisse2013-06-191-0/+3
* | | Merge branch 'nk/name-rev-abbreviated-refs'Junio C Hamano2013-06-301-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-06-301-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
* | | Merge branch 'maint'Junio C Hamano2013-06-271-0/+54
|\ \ \ | |/ /
| * | Start preparing for 1.8.3.2Junio C Hamano2013-06-271-0/+54
| * | Merge branch 'nd/urls-doc-no-file-hyperlink-fix' into maintJunio C Hamano2013-06-271-1/+1
| |\ \
| * \ \ Merge branch 'tr/push-no-verify-doc' into maintJunio C Hamano2013-06-271-1/+6
| |\ \ \
| * \ \ \ Merge branch 'mh/fetch-into-shallow' into maintJunio C Hamano2013-06-271-2/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'jh/checkout-auto-tracking' into maintJunio C Hamano2013-06-272-9/+10
| |\ \ \ \ \
* | | | | | | Update draft release notes to 1.8.4Junio C Hamano2013-06-271-1/+10
* | | | | | | Merge branch 'rr/rebase-stash-store'Junio C Hamano2013-06-271-2/+11
|\ \ \ \ \ \ \
| * | | | | | | stash: introduce 'git stash store'Ramkumar Ramachandra2013-06-171-0/+7
| * | | | | | | stash doc: document short form -p in synopsisRamkumar Ramachandra2013-06-171-1/+1
| * | | | | | | stash doc: add a warning about using createRamkumar Ramachandra2013-06-171-1/+3
* | | | | | | | Update draft release notes to 1.8.4Junio C Hamano2013-06-261-0/+12
* | | | | | | | Merge branch 'ys/cygstart'Junio C Hamano2013-06-261-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | web--browse: support /usr/bin/cygstart on CygwinYaakov Selkowitz2013-06-211-0/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'wk/doc-git-has-grown'Junio C Hamano2013-06-261-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | user-manual: Update download size for Git and the kernelW. Trevor King2013-06-231-3/+3
* | | | | | | | | Merge branch 'ph/builtin-srcs-are-in-subdir-these-days'Junio C Hamano2013-06-264-15/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix "builtin-*" references to be "builtin/*"Phil Hord2013-06-184-15/+16
* | | | | | | | | | Merge branch 'mm/merge-in-dirty-worktree-doc'Junio C Hamano2013-06-261-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Documentation/git-merge.txt: weaken warning about uncommited changesMatthieu Moy2013-06-181-2/+2
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'kb/diff-blob-blob-doc'Junio C Hamano2013-06-261-7/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Documentation: Move "git diff <blob> <blob>"Kevin Bracey2013-06-181-7/+7
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'mm/push-force-is-dangerous'Junio C Hamano2013-06-261-0/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Documentation/git-push.txt: explain better cases where --force is dangerousMatthieu Moy2013-06-181-0/+9
| |/ / / / / / / / /
* | | | | | | | | | Update draft release notes to 1.8.4Junio C Hamano2013-06-241-4/+14
* | | | | | | | | | Merge branch 'nk/config-local-doc'Junio C Hamano2013-06-241-0/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | config: Add description of --local optionNamhyung Kim2013-06-171-0/+9
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'jk/doc-build-move-infordir-def'Junio C Hamano2013-06-241-22/+22
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Documentation/Makefile: move infodir to be with other '*dir'sJohn Keeping2013-06-171-1/+1
| * | | | | | | | | | Documentation/Makefile: fix spaces around assignmentsJohn Keeping2013-06-171-21/+21
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'mm/rm-coalesce-errors'Junio C Hamano2013-06-241-0/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rm: introduce advice.rmHints to shorten messagesMathieu Lienard--Mayor2013-06-121-0/+3
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Revert "Merge branch 'jg/status-config'"Junio C Hamano2013-06-241-8/+0
* | | | | | | | | | Update draft release notes to 1.8.4Junio C Hamano2013-06-231-0/+4
* | | | | | | | | | Merge branch 'jg/status-config'Junio C Hamano2013-06-231-0/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | status: introduce status.branch to enable --branch by defaultJorge Juan Garcia Garcia2013-06-151-0/+4
| * | | | | | | | | | status: introduce status.short to enable --short by defaultJorge Juan Garcia Garcia2013-06-111-0/+4
| |/ / / / / / / / /
* | | | | | | | | | Update draft release notes to 1.8.4Junio C Hamano2013-06-201-1/+18