Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rr/rebase-stash-store' | Junio C Hamano | 2013-06-27 | 1 | -2/+11 |
|\ | |||||
| * | stash: introduce 'git stash store' | Ramkumar Ramachandra | 2013-06-17 | 1 | -0/+7 |
| * | stash doc: document short form -p in synopsis | Ramkumar Ramachandra | 2013-06-17 | 1 | -1/+1 |
| * | stash doc: add a warning about using create | Ramkumar Ramachandra | 2013-06-17 | 1 | -1/+3 |
* | | Update draft release notes to 1.8.4 | Junio C Hamano | 2013-06-26 | 1 | -0/+12 |
* | | Merge branch 'ys/cygstart' | Junio C Hamano | 2013-06-26 | 1 | -0/+1 |
|\ \ | |||||
| * | | web--browse: support /usr/bin/cygstart on Cygwin | Yaakov Selkowitz | 2013-06-21 | 1 | -0/+1 |
* | | | Merge branch 'wk/doc-git-has-grown' | Junio C Hamano | 2013-06-26 | 1 | -3/+3 |
|\ \ \ | |||||
| * | | | user-manual: Update download size for Git and the kernel | W. Trevor King | 2013-06-23 | 1 | -3/+3 |
* | | | | Merge branch 'ph/builtin-srcs-are-in-subdir-these-days' | Junio C Hamano | 2013-06-26 | 4 | -15/+16 |
|\ \ \ \ | |||||
| * | | | | fix "builtin-*" references to be "builtin/*" | Phil Hord | 2013-06-18 | 4 | -15/+16 |
* | | | | | Merge branch 'mm/merge-in-dirty-worktree-doc' | Junio C Hamano | 2013-06-26 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Documentation/git-merge.txt: weaken warning about uncommited changes | Matthieu Moy | 2013-06-18 | 1 | -2/+2 |
| |/ / / / | |||||
* | | | | | Merge branch 'kb/diff-blob-blob-doc' | Junio C Hamano | 2013-06-26 | 1 | -7/+7 |
|\ \ \ \ \ | |||||
| * | | | | | Documentation: Move "git diff <blob> <blob>" | Kevin Bracey | 2013-06-18 | 1 | -7/+7 |
| |/ / / / | |||||
* | | | | | Merge branch 'mm/push-force-is-dangerous' | Junio C Hamano | 2013-06-26 | 1 | -0/+9 |
|\ \ \ \ \ | |||||
| * | | | | | Documentation/git-push.txt: explain better cases where --force is dangerous | Matthieu Moy | 2013-06-18 | 1 | -0/+9 |
| |/ / / / | |||||
* | | | | | Update draft release notes to 1.8.4 | Junio C Hamano | 2013-06-24 | 1 | -4/+14 |
* | | | | | Merge branch 'nk/config-local-doc' | Junio C Hamano | 2013-06-24 | 1 | -0/+9 |
|\ \ \ \ \ | |||||
| * | | | | | config: Add description of --local option | Namhyung Kim | 2013-06-17 | 1 | -0/+9 |
| |/ / / / | |||||
* | | | | | Merge branch 'jk/doc-build-move-infordir-def' | Junio C Hamano | 2013-06-24 | 1 | -22/+22 |
|\ \ \ \ \ | |||||
| * | | | | | Documentation/Makefile: move infodir to be with other '*dir's | John Keeping | 2013-06-17 | 1 | -1/+1 |
| * | | | | | Documentation/Makefile: fix spaces around assignments | John Keeping | 2013-06-17 | 1 | -21/+21 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'mm/rm-coalesce-errors' | Junio C Hamano | 2013-06-24 | 1 | -0/+3 |
|\ \ \ \ \ | |||||
| * | | | | | rm: introduce advice.rmHints to shorten messages | Mathieu Lienard--Mayor | 2013-06-12 | 1 | -0/+3 |
* | | | | | | Revert "Merge branch 'jg/status-config'" | Junio C Hamano | 2013-06-24 | 1 | -8/+0 |
* | | | | | | Update draft release notes to 1.8.4 | Junio C Hamano | 2013-06-23 | 1 | -0/+4 |
* | | | | | | Merge branch 'jg/status-config' | Junio C Hamano | 2013-06-23 | 1 | -0/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | status: introduce status.branch to enable --branch by default | Jorge Juan Garcia Garcia | 2013-06-15 | 1 | -0/+4 |
| * | | | | | | status: introduce status.short to enable --short by default | Jorge Juan Garcia Garcia | 2013-06-11 | 1 | -0/+4 |
| |/ / / / / | |||||
* | | | | | | Update draft release notes to 1.8.4 | Junio C Hamano | 2013-06-20 | 1 | -1/+18 |
* | | | | | | Merge branch 'mm/color-auto-default' | Junio C Hamano | 2013-06-20 | 1 | -5/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | make color.ui default to 'auto' | Matthieu Moy | 2013-06-10 | 1 | -5/+6 |
* | | | | | | | Merge branch 'nd/traces' | Junio C Hamano | 2013-06-20 | 1 | -0/+13 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git.txt: document GIT_TRACE_PACKET | Nguyễn Thái Ngọc Duy | 2013-06-09 | 1 | -0/+6 |
| * | | | | | | | core: use env variable instead of config var to turn on logging pack access | Nguyễn Thái Ngọc Duy | 2013-06-09 | 1 | -0/+7 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Update draft release notes to 1.8.4 | Junio C Hamano | 2013-06-15 | 1 | -0/+17 |
* | | | | | | | Merge branch 'kb/full-history-compute-treesame-carefully-2' | Junio C Hamano | 2013-06-14 | 1 | -17/+25 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | simplify-merges: drop merge from irrelevant side branch | Kevin Bracey | 2013-05-16 | 1 | -13/+21 |
| * | | | | | | | simplify-merges: never remove all TREESAME parents | Kevin Bracey | 2013-05-16 | 1 | -1/+2 |
| * | | | | | | | revision.c: Make --full-history consider more merges | Kevin Bracey | 2013-05-16 | 1 | -3/+3 |
| * | | | | | | | Documentation: avoid "uninteresting" | Kevin Bracey | 2013-05-16 | 1 | -2/+2 |
| * | | | | | | | rev-list-options.txt: correct TREESAME for P | Kevin Bracey | 2013-05-16 | 1 | -2/+1 |
* | | | | | | | | Update draft release notes | Junio C Hamano | 2013-06-11 | 1 | -1/+48 |
* | | | | | | | | Merge branch 'rr/maint-fetch-tag-doc-asterisks' | Junio C Hamano | 2013-06-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fetch-options.txt: prevent a wildcard refspec from getting misformatted | Junio C Hamano | 2013-06-07 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'rr/rebase-autostash' | Junio C Hamano | 2013-06-11 | 2 | -0/+18 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | rebase: implement --[no-]autostash and rebase.autostash | Ramkumar Ramachandra | 2013-05-29 | 2 | -0/+18 |
* | | | | | | | | | Merge branch 'fc/at-head' | Junio C Hamano | 2013-06-11 | 2 | -0/+5 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add new @ shortcut for HEAD | Felipe Contreras | 2013-05-08 | 2 | -0/+5 |
| |/ / / / / / / / |