Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | git-sh-setup: use a lowercase "usage:" string | David Aguilar | 2013-02-24 | 1 | -3/+3 |
* | Sync with v1.8.1.4 | Junio C Hamano | 2013-02-19 | 3 | -3/+78 |
|\ | |||||
| * | Git 1.8.1.4v1.8.1.4 | Junio C Hamano | 2013-02-19 | 4 | -3/+15 |
| * | Merge branch 'ob/imap-send-ssl-verify' into maint | Junio C Hamano | 2013-02-19 | 1 | -2/+65 |
| |\ | |||||
| | * | imap-send: support subjectAltName as well | Oswald Buddenhagen | 2013-02-19 | 1 | -0/+19 |
| | * | imap-send: the subject of SSL certificate must match the host | Oswald Buddenhagen | 2013-02-19 | 1 | -0/+39 |
| | * | imap-send: move #ifdef around | Junio C Hamano | 2013-02-18 | 1 | -2/+7 |
* | | | Merge branch 'jc/mention-tracking-for-pull-default' | Junio C Hamano | 2013-02-18 | 1 | -1/+2 |
|\ \ \ | |||||
| * | | | doc: mention tracking for pull.default | Junio C Hamano | 2013-01-31 | 1 | -1/+2 |
* | | | | Merge branch 'mm/config-intro-in-git-doc' | Junio C Hamano | 2013-02-18 | 1 | -6/+5 |
|\ \ \ \ | |||||
| * | | | | git.txt: update description of the configuration mechanism | Matthieu Moy | 2013-02-15 | 1 | -6/+5 |
* | | | | | RelNotes 1.8.2: push-simple will not be in effect in this release | Junio C Hamano | 2013-02-18 | 1 | -2/+14 |
* | | | | | shell-prompt: clean up nested if-then | Martin Erik Werner | 2013-02-18 | 1 | -14/+13 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2013-02-18 | 1 | -40/+55 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | user-manual: use -o latest.tar.gz to create a gzipped tarball | W. Trevor King | 2013-02-18 | 1 | -3/+12 |
| * | | | | user-manual: use 'git config --global user.*' for setup | W. Trevor King | 2013-02-18 | 1 | -5/+13 |
| * | | | | user-manual: mention 'git remote add' for remote branch config | W. Trevor King | 2013-02-18 | 1 | -27/+13 |
| * | | | | user-manual: give 'git push -f' as an alternative to +master | W. Trevor King | 2013-02-18 | 1 | -0/+7 |
| * | | | | user-manual: use 'remote add' to setup push URLs | W. Trevor King | 2013-02-18 | 1 | -5/+10 |
| |/ / / | |||||
* | | | | Merge git://github.com/git-l10n/git-po | Junio C Hamano | 2013-02-18 | 3 | -1873/+2284 |
|\ \ \ \ | |||||
| * | | | | l10n: zh_CN.po: translate 35 new messages | Jiang Xin | 2013-02-18 | 1 | -625/+767 |
| * | | | | l10n: vi.po: update new strings (2004t0u0f) | Tran Ngoc Quan | 2013-02-17 | 1 | -647/+795 |
| * | | | | l10n: Update git.pot (35 new, 14 removed messages) | Jiang Xin | 2013-02-14 | 1 | -601/+722 |
* | | | | | Git 1.8.2-rc0v1.8.2-rc0 | Junio C Hamano | 2013-02-17 | 2 | -1/+14 |
* | | | | | Merge branch 'jc/hidden-refs' | Junio C Hamano | 2013-02-17 | 7 | -30/+166 |
|\ \ \ \ \ | |||||
| * | | | | | upload/receive-pack: allow hiding ref hierarchies | Junio C Hamano | 2013-02-07 | 7 | -1/+146 |
| * | | | | | upload-pack: simplify request validation | Junio C Hamano | 2013-01-28 | 1 | -17/+11 |
| * | | | | | upload-pack: share more code | Junio C Hamano | 2013-01-18 | 1 | -17/+14 |
* | | | | | | Merge branch 'mp/diff-algo-config' | Junio C Hamano | 2013-02-17 | 6 | -1/+95 |
|\ \ \ \ \ \ | |||||
| * | | | | | | diff: Introduce --diff-algorithm command line option | Michal Privoznik | 2013-01-16 | 5 | -1/+53 |
| * | | | | | | config: Introduce diff.algorithm variable | Michal Privoznik | 2013-01-16 | 3 | -0/+42 |
| * | | | | | | git-completion.bash: Autocomplete --minimal and --histogram for git-diff | Michal Privoznik | 2013-01-14 | 1 | -1/+1 |
* | | | | | | | Merge branch 'mw/bash-prompt-show-untracked-config' | Junio C Hamano | 2013-02-17 | 2 | -4/+85 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t9903: add extra tests for bash.showDirtyState | Martin Erik Werner | 2013-02-13 | 1 | -1/+37 |
| * | | | | | | | t9903: add tests for bash.showUntrackedFiles | Martin Erik Werner | 2013-02-13 | 1 | -0/+40 |
| * | | | | | | | shell prompt: add bash.showUntrackedFiles option | Martin Erik Werner | 2013-02-13 | 1 | -3/+8 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jk/rebase-i-comment-char' | Junio C Hamano | 2013-02-17 | 2 | -40/+58 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | rebase -i: respect core.commentchar | John Keeping | 2013-02-12 | 2 | -40/+58 |
* | | | | | | | | Merge branch 'jk/read-commit-buffer-data-after-free' | Junio C Hamano | 2013-02-17 | 2 | -7/+78 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | log: re-encode commit messages before grepping | Jeff King | 2013-02-11 | 2 | -7/+78 |
* | | | | | | | | | Update draft release notes to 1.8.2 | Junio C Hamano | 2013-02-15 | 1 | -0/+12 |
* | | | | | | | | | Merge branch 'wk/man-deny-current-branch-is-default-these-days' | Junio C Hamano | 2013-02-14 | 1 | -3/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | user-manual: Update for receive.denyCurrentBranch=refuse | W. Trevor King | 2013-02-14 | 1 | -3/+4 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'mk/make-rm-depdirs-could-be-empty' | Junio C Hamano | 2013-02-14 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Makefile: don't run "rm" without any files | Matt Kraai | 2013-02-13 | 1 | -2/+1 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'mm/config-local-completion' | Junio C Hamano | 2013-02-14 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | completion: support 'git config --local' | Matthieu Moy | 2013-02-12 | 1 | -2/+2 |
* | | | | | | | | | | Merge branch 'ef/non-ascii-parse-options-error-diag' | Junio C Hamano | 2013-02-14 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | parse-options: report uncorrupted multi-byte options | Erik Faye-Lund | 2013-02-11 | 1 | -1/+4 |
* | | | | | | | | | | | Merge branch 'mk/old-expat' | Junio C Hamano | 2013-02-14 | 3 | -0/+11 |
|\ \ \ \ \ \ \ \ \ \ \ |