summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | Merge branch 'mm/color-auto-default'Junio C Hamano2013-06-201-5/+6
|\ \ \ \ \ \
| * | | | | | make color.ui default to 'auto'Matthieu Moy2013-06-101-5/+6
* | | | | | | Merge branch 'nd/traces'Junio C Hamano2013-06-201-0/+13
|\ \ \ \ \ \ \
| * | | | | | | git.txt: document GIT_TRACE_PACKETNguyễn Thái Ngọc Duy2013-06-091-0/+6
| * | | | | | | core: use env variable instead of config var to turn on logging pack accessNguyễn Thái Ngọc Duy2013-06-091-0/+7
| | |/ / / / / | |/| | | | |
* | | | | | | Update draft release notes to 1.8.4Junio C Hamano2013-06-151-0/+17
* | | | | | | Merge branch 'kb/full-history-compute-treesame-carefully-2'Junio C Hamano2013-06-141-17/+25
|\ \ \ \ \ \ \
| * | | | | | | simplify-merges: drop merge from irrelevant side branchKevin Bracey2013-05-161-13/+21
| * | | | | | | simplify-merges: never remove all TREESAME parentsKevin Bracey2013-05-161-1/+2
| * | | | | | | revision.c: Make --full-history consider more mergesKevin Bracey2013-05-161-3/+3
| * | | | | | | Documentation: avoid "uninteresting"Kevin Bracey2013-05-161-2/+2
| * | | | | | | rev-list-options.txt: correct TREESAME for PKevin Bracey2013-05-161-2/+1
* | | | | | | | Update draft release notesJunio C Hamano2013-06-111-1/+48
* | | | | | | | Merge branch 'rr/maint-fetch-tag-doc-asterisks'Junio C Hamano2013-06-111-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | fetch-options.txt: prevent a wildcard refspec from getting misformattedJunio C Hamano2013-06-071-1/+1
* | | | | | | | | Merge branch 'rr/rebase-autostash'Junio C Hamano2013-06-112-0/+18
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | rebase: implement --[no-]autostash and rebase.autostashRamkumar Ramachandra2013-05-292-0/+18
* | | | | | | | | Merge branch 'fc/at-head'Junio C Hamano2013-06-112-0/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add new @ shortcut for HEADFelipe Contreras2013-05-082-0/+5
| |/ / / / / / / /