Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rh/merge-options-doc-fix' into maint | Junio C Hamano | 2013-07-03 | 1 | -1/+2 |
|\ | |||||
| * | Documentation/merge-options.txt: restore `-e` option | Richard Hansen | 2013-05-16 | 1 | -1/+2 |
* | | Merge branch 'an/diff-index-doc' into maint | Junio C Hamano | 2013-07-03 | 1 | -6/+6 |
|\ \ | |||||
| * | | Documentation/diff-index: mention two modes of operation | Junio C Hamano | 2013-05-20 | 1 | -6/+6 |
| |/ | |||||
* | | Merge branch 'cm/gitweb-project-list-persistent-cgi-fix' into maint | Junio C Hamano | 2013-07-03 | 1 | -1/+1 |
|\ \ | |||||
| * | | gitweb: fix problem causing erroneous project list | Charles McGarvey | 2013-06-07 | 1 | -1/+1 |
* | | | Merge branch 'ar/wildmatch-foldcase' into maint | Junio C Hamano | 2013-07-03 | 2 | -6/+56 |
|\ \ \ | |||||
| * | | | wildmatch: properly fold case everywhere | Anthony Ramine | 2013-06-02 | 2 | -6/+56 |
| |/ / | |||||
* | | | Merge branch 'cb/log-follow-with-combined' into maint | Junio C Hamano | 2013-07-03 | 2 | -0/+17 |
|\ \ \ | |||||
| * | | | fix segfault with git log -c --follow | Clemens Buchacher | 2013-05-28 | 2 | -0/+17 |
* | | | | Merge branch 'rr/die-on-missing-upstream' into maint | Junio C Hamano | 2013-07-03 | 2 | -17/+22 |
|\ \ \ \ | |||||
| * | | | | sha1_name: fix error message for @{<N>}, @{<date>} | Ramkumar Ramachandra | 2013-06-02 | 1 | -1/+10 |
| * | | | | sha1_name: fix error message for @{u} | Ramkumar Ramachandra | 2013-05-22 | 2 | -16/+12 |
* | | | | | Merge branch 'maint-1.8.2' into maint | Junio C Hamano | 2013-07-03 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'maint-1.8.1' into maint-1.8.2 | Junio C Hamano | 2013-07-03 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | git-config: update doc for --get with multiple valuesmaint-1.8.1 | John Keeping | 2013-07-03 | 1 | -1/+1 |
| | | |/ / / | | |/| | | | |||||
* | | | | | | t7500: fix flipped actual/expect | Andrew Pimlott | 2013-07-01 | 1 | -3/+3 |
* | | | | | | lib-rebase: document exec_ in FAKE_LINES | Andrew Pimlott | 2013-07-01 | 1 | -0/+2 |
* | | | | | | Start preparing for 1.8.3.3 | Junio C Hamano | 2013-06-30 | 2 | -1/+12 |
* | | | | | | Merge branch 'fc/macos-x-clipped-write' into maint | Junio C Hamano | 2013-06-30 | 4 | -0/+27 |
|\ \ \ \ \ \ | |||||
| * | | | | | | compate/clipped-write.c: large write(2) fails on Mac OS X/XNU | Filipe Cabecinhas | 2013-05-17 | 4 | -0/+27 |
* | | | | | | | Merge branch 'da/darwin' into maint | Junio C Hamano | 2013-06-30 | 2 | -0/+25 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | imap-send: eliminate HMAC deprecation warnings on Mac OS X | David Aguilar | 2013-05-21 | 1 | -0/+10 |
| * | | | | | | | cache.h: eliminate SHA-1 deprecation warnings on Mac OS X | David Aguilar | 2013-05-20 | 1 | -0/+6 |
| * | | | | | | | Makefile: add support for Apple CommonCrypto facility | David Aguilar | 2013-05-20 | 1 | -0/+8 |
| * | | | | | | | Makefile: fix default regex settings on Darwin | David Aguilar | 2013-05-11 | 1 | -0/+1 |
* | | | | | | | | check-ignore doc: fix broken link to ls-files page | Ramkumar Ramachandra | 2013-06-30 | 1 | -1/+1 |
* | | | | | | | | test: spell 'ls-files --delete' option correctly in test descriptions | SZEDER Gábor | 2013-06-30 | 1 | -2/+2 |
* | | | | | | | | Git 1.8.3.2v1.8.3.2 | Junio C Hamano | 2013-06-28 | 3 | -2/+8 |
* | | | | | | | | configure: fix option help message for --disable-pthreads | Stefano Lattarini | 2013-06-28 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'nd/clone-connectivity-shortcut' (early part) into maint | Junio C Hamano | 2013-06-28 | 6 | -38/+97 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fetch-pack: prepare updated shallow file before fetching the pack | Nguyễn Thái Ngọc Duy | 2013-05-28 | 5 | -38/+93 |
| * | | | | | | | | clone: let the user know when check_everything_connected is run | Nguyễn Thái Ngọc Duy | 2013-05-11 | 1 | -0/+4 |
| |/ / / / / / / | |||||
* | | | | | | | | Start preparing for 1.8.3.2 | Junio C Hamano | 2013-06-27 | 2 | -1/+55 |
* | | | | | | | | Merge branch 'ks/difftool-dir-diff-copy-fix' into maint | Junio C Hamano | 2013-06-27 | 2 | -7/+21 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | difftool --dir-diff: allow changing any clean working tree file | Kenichi Saita | 2013-05-29 | 2 | -7/+21 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'rr/push-head' into maint | Junio C Hamano | 2013-06-27 | 1 | -7/+14 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | push: make push.default = current use resolved HEAD | Ramkumar Ramachandra | 2013-05-29 | 1 | -1/+1 |
| * | | | | | | | | push: fail early with detached HEAD and current | Ramkumar Ramachandra | 2013-05-29 | 1 | -0/+5 |
| * | | | | | | | | push: factor out the detached HEAD error message | Ramkumar Ramachandra | 2013-05-29 | 1 | -6/+8 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'fc/show-branch-in-rebase-am' into maint | Junio C Hamano | 2013-06-27 | 2 | -1/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | prompt: fix for simple rebase | Felipe Contreras | 2013-05-29 | 2 | -1/+3 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'tg/maint-zsh-svn-remote-prompt' into maint | Junio C Hamano | 2013-06-27 | 1 | -3/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | prompt: fix show upstream with svn and zsh | Thomas Gummerer | 2013-05-22 | 1 | -3/+4 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'nd/urls-doc-no-file-hyperlink-fix' into maint | Junio C Hamano | 2013-06-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | urls.txt: avoid auto converting to hyperlink | Nguyễn Thái Ngọc Duy | 2013-05-24 | 1 | -1/+1 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'tr/push-no-verify-doc' into maint | Junio C Hamano | 2013-06-27 | 1 | -1/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Document push --no-verify | Thomas Rast | 2013-05-23 | 1 | -1/+6 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'rs/commit-m-no-edit' into maint | Junio C Hamano | 2013-06-27 | 2 | -4/+23 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | commit: don't start editor if empty message is given with -m | René Scharfe | 2013-05-28 | 2 | -4/+23 |
| |/ / / / / / / |