Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rj/cygwin-clarify-use-of-cheating-lstat' | Junio C Hamano | 2013-08-02 | 1 | -11/+0 |
|\ | |||||
| * | cygwin: Remove the Win32 l/stat() implementationrj/cygwin-clarify-use-of-cheating-lstat | Ramsay Jones | 2013-07-18 | 1 | -11/+0 |
* | | Merge branch 'rr/send-email-ssl-verify' | Junio C Hamano | 2013-07-22 | 1 | -0/+4 |
|\ \ | |||||
| * | | send-email: be explicit with SSL certificate verificationrr/send-email-ssl-verify | Ramkumar Ramachandra | 2013-07-18 | 1 | -0/+4 |
* | | | Merge branch 'jx/clean-interactive' | Junio C Hamano | 2013-07-22 | 1 | -8/+13 |
|\ \ \ | |_|/ |/| | | |||||
| * | | git-clean: add colors to interactive git-clean | Jiang Xin | 2013-06-26 | 1 | -8/+9 |
| * | | git-clean: show items of del_list in columns | Jiang Xin | 2013-06-26 | 1 | -0/+4 |
| |/ | |||||
* | | Merge branch 'jg/status-config' | Junio C Hamano | 2013-07-11 | 1 | -0/+8 |
|\ \ | |||||
| * | | status: introduce status.branch to enable --branch by default | Jorge Juan Garcia Garcia | 2013-06-24 | 1 | -0/+4 |
| * | | status: introduce status.short to enable --short by default | Jorge Juan Garcia Garcia | 2013-06-24 | 1 | -0/+4 |
| |/ | |||||
* | | Merge branch 'jc/triangle-push-fixup' | Junio C Hamano | 2013-07-11 | 1 | -30/+50 |
|\ \ | |||||
| * | | push: change `simple` to accommodate triangular workflows | Ramkumar Ramachandra | 2013-06-24 | 1 | -3/+7 |
| * | | config doc: rewrite push.default section | Ramkumar Ramachandra | 2013-06-23 | 1 | -28/+44 |
* | | | Merge branch 'rr/column-doc' | Junio C Hamano | 2013-07-01 | 1 | -3/+17 |
|\ \ \ | |||||
| * | | | column doc: rewrite documentation for column.ui | Ramkumar Ramachandra | 2013-06-26 | 1 | -3/+17 |
| | |/ | |/| | |||||
* | | | 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 |
* | | | 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 |
| |/ / | |||||
* | | | 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 |
* | | | rebase: implement --[no-]autostash and rebase.autostash | Ramkumar Ramachandra | 2013-05-29 | 1 | -0/+8 |
| |/ |/| | |||||
* | | Merge branch 'maint' | Junio C Hamano | 2013-04-28 | 1 | -6/+6 |
|\ \ | |/ | |||||
| * | documentation: trivial whitespace cleanups | Felipe Contreras | 2013-04-28 | 1 | -6/+6 |
* | | Merge branch 'ta/glossary' | Junio C Hamano | 2013-04-21 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | The name of the hash function is "SHA-1", not "SHA1" | Thomas Ackermann | 2013-04-15 | 1 | -1/+1 |
* | | Merge branch 'fc/branch-upstream-color' | Junio C Hamano | 2013-04-19 | 1 | -1/+2 |
|\ \ | |||||
| * | | branch: colour upstream branches | Felipe Contreras | 2013-04-15 | 1 | -1/+2 |
* | | | Merge branch 'mv/ssl-ftp-curl' | Junio C Hamano | 2013-04-19 | 1 | -0/+8 |
|\ \ \ | |||||
| * | | | Support FTP-over-SSL/TLS for regular FTP | Modestas Vainius | 2013-04-12 | 1 | -0/+8 |
| | |/ | |/| | |||||
| * | | Merge branch 'tb/document-status-u-tradeoff' into maint | Junio C Hamano | 2013-04-01 | 1 | -0/+4 |
| |\ \ | |||||
* | \ \ | Merge branch 'fc/send-email-annotate' | Junio C Hamano | 2013-04-18 | 1 | -0/+6 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | format-patch: add format.coverLetter configuration variable | Felipe Contreras | 2013-04-07 | 1 | -0/+5 |
| * | | | send-email: make annotate configurable | Felipe Contreras | 2013-04-07 | 1 | -0/+1 |
* | | | | remote.c: introduce branch.<name>.pushremote | Ramkumar Ramachandra | 2013-04-02 | 1 | -4/+15 |
* | | | | remote.c: introduce remote.pushdefault | Ramkumar Ramachandra | 2013-04-02 | 1 | -3/+10 |
|/ / / | |||||
* | | | Merge branch 'maint' | Junio C Hamano | 2013-03-28 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'maint-1.8.1' into maint | Junio C Hamano | 2013-03-28 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | git help config: s/insn/instruction/ | Matthias Krüger | 2013-03-28 | 1 | -1/+1 |
| * | | | Merge branch 'gp/avoid-explicit-mention-of-dot-git-refs' into maint | Junio C Hamano | 2013-03-26 | 1 | -1/+1 |
| |\ \ \ | |||||
* | \ \ \ | Merge branch 'jc/fetch-raw-sha1' | Junio C Hamano | 2013-03-21 | 1 | -1/+7 |
|\ \ \ \ \ | |||||
| * | | | | | upload-pack: optionally allow fetching from the tips of hidden refs | Junio C Hamano | 2013-02-07 | 1 | -1/+7 |
* | | | | | | Merge branch 'tb/document-status-u-tradeoff' | Junio C Hamano | 2013-03-21 | 1 | -0/+4 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | status: advise to consider use of -u when read_directory takes too long | Nguyễn Thái Ngọc Duy | 2013-03-16 | 1 | -0/+4 |
| * | | | | | Documentation: move diff.wordRegex from config.txt to diff-config.txt | Ramkumar Ramachandra | 2012-12-27 | 1 | -6/+0 |
* | | | | | | Merge branch 'gp/avoid-explicit-mention-of-dot-git-refs' | Junio C Hamano | 2013-03-19 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | | | |||||
| * | | | | Fix ".git/refs" stragglers | Greg Price | 2013-02-24 | 1 | -1/+1 |
* | | | | | Sync with 'maint' | Junio C Hamano | 2013-02-25 | 1 | -1/+1 |
|\ \ \ \ \ | | |_|_|/ | |/| | | |