summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* refs: write packed_refs file using stdiojk/write-packed-refs-via-stdioJeff King2014-09-103-23/+33
* Update draft release notes to 2.2Junio C Hamano2014-09-091-3/+42
* Merge branch 'sp/pack-protocol-doc-on-shallow'Junio C Hamano2014-09-091-1/+1
|\
| * Document LF appearing in shallow command during send-pack/receive-packsp/pack-protocol-doc-on-shallowShawn Pearce2014-08-281-1/+1
* | Merge branch 'tf/imap-send-create'Junio C Hamano2014-09-092-51/+33
|\ \
| * | imap-send: create target mailbox if it is missingtf/imap-send-createTony Finch2014-08-251-50/+31
| * | imap-send: clarify CRAM-MD5 vs LOGIN documentationTony Finch2014-07-311-1/+2
* | | Merge branch 'jk/prompt-stash-could-be-packed'Junio C Hamano2014-09-091-1/+2
|\ \ \
| * | | git-prompt: do not look for refs/stash in $GIT_DIRjk/prompt-stash-could-be-packedJeff King2014-08-251-1/+2
* | | | Merge branch 'tb/pretty-format-cd-date-format'Junio C Hamano2014-09-091-1/+1
|\ \ \ \
| * | | | pretty: note that %cd respects the --date= optiontb/pretty-format-cd-date-formatThomas Braun2014-08-211-1/+1
| |/ / /
* | | | Merge branch 'rs/inline-compat-path-macros'Junio C Hamano2014-09-091-6/+22
|\ \ \ \
| * | | | turn path macros into inline functionrs/inline-compat-path-macrosRené Scharfe2014-08-181-6/+22
* | | | | Merge branch 'rs/clean-menu-item-defn'Junio C Hamano2014-09-091-1/+1
|\ \ \ \ \
| * | | | | clean: use f(void) instead of f() to declare a pointer to a function without ...rs/clean-menu-item-defnRené Scharfe2014-08-181-1/+1
* | | | | | Merge branch 'jc/config-mak-document-darwin-vs-macosx'Junio C Hamano2014-09-091-0/+5
|\ \ \ \ \ \
| * | | | | | config.mak.uname: add hint on uname_R for MacOS Xjc/config-mak-document-darwin-vs-macosxJunio C Hamano2014-08-151-0/+4
| * | | | | | config.mak.uname: set NO_APPLE_COMMON_CRYPTO on older systemskm/no-apple-common-crypto-on-darwin-8-and-belowKyle J. McKay2014-08-151-0/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'sb/mailsplit-dead-code-removal'Junio C Hamano2014-09-091-11/+6
|\ \ \ \ \ \
| * | | | | | mailsplit.c: remove dead codesb/mailsplit-dead-code-removalStefan Beller2014-08-131-11/+6
* | | | | | | Merge branch 'so/rebase-doc'Junio C Hamano2014-09-091-5/+2
|\ \ \ \ \ \ \
| * | | | | | | Documentation/git-rebase.txt: -f forces a rebase that would otherwise be a no-opSergey Organov2014-08-121-5/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'sb/prepare-revision-walk-error-check'Junio C Hamano2014-09-093-3/+7
|\ \ \ \ \ \ \
| * | | | | | | prepare_revision_walk(): check for return value in all placessb/prepare-revision-walk-error-checkStefan Beller2014-08-123-3/+7
| |/ / / / / /
* | | | | | | Merge branch 'sb/blame-msg-i18n'Junio C Hamano2014-09-091-1/+1
|\ \ \ \ \ \ \
| * | | | | | | builtin/blame.c: add translation to warning about failed revision walksb/blame-msg-i18nStefan Beller2014-08-121-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'nd/strbuf-utf8-replace'Junio C Hamano2014-09-092-0/+10
|\ \ \ \ \ \ \
| * | | | | | | utf8.c: fix strbuf_utf8_replace() consuming data beyond input stringnd/strbuf-utf8-replaceNguyễn Thái Ngọc Duy2014-08-112-0/+10
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'sb/plug-leaks'Junio C Hamano2014-09-092-3/+5
|\ \ \ \ \ \ \
| * | | | | | | clone.c: don't leak memory in cmd_clonesb/plug-leaksStefan Beller2014-08-101-0/+2
| * | | | | | | remote.c: don't leak the base branch name in format_tracking_infoStefan Beller2014-08-101-3/+3
| |/ / / / / /
* | | | | | | Merge branch 'rs/refresh-beyond-symlink'Junio C Hamano2014-09-092-0/+51
|\ \ \ \ \ \ \
| * | | | | | | read-cache: check for leading symlinks when refreshing indexrs/refresh-beyond-symlinkRené Scharfe2014-08-102-0/+51
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'la/init-doc'Junio C Hamano2014-09-091-39/+46
|\ \ \ \ \ \ \
| * | | | | | | Documentation: git-init: flesh out examplela/init-docLinus Arver2014-08-081-0/+2
| * | | | | | | Documentation: git-init: template directory: reword and cross-referenceLinus Arver2014-08-081-3/+2
| * | | | | | | Documentation: git-init: reword parenthetical statementsLinus Arver2014-08-081-2/+2
| * | | | | | | Documentation: git-init: --separate-git-dir: clarifyLinus Arver2014-08-081-6/+6
| * | | | | | | Documentation: git-init: template directory: rewordLinus Arver2014-08-081-5/+5
| * | | | | | | Documentation: git-init: list items faceliftLinus Arver2014-08-081-21/+28
| * | | | | | | Documentation: git-init: typographical fixesLinus Arver2014-08-081-6/+5
* | | | | | | | Merge branch 'jk/stash-list-p'Junio C Hamano2014-09-092-1/+43
|\ \ \ \ \ \ \ \
| * | | | | | | | stash: default listing to working-tree diffjk/stash-list-pJeff King2014-08-072-1/+43
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'mm/log-branch-desc-plug-leak'Junio C Hamano2014-09-091-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | builtin/log.c: fix minor memory leakmm/log-branch-desc-plug-leakMatthieu Moy2014-08-071-0/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'lf/bundle-exclusion'Junio C Hamano2014-09-092-3/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | bundle: fix exclusion of annotated tagslf/bundle-exclusionLukas Fleischer2014-08-072-3/+6
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'jc/apply-ws-prefix'Junio C Hamano2014-09-093-63/+96
|\ \ \ \ \ \ \ \
| * | | | | | | | apply: omit ws check for excluded pathsjc/apply-ws-prefixJunio C Hamano2014-08-072-3/+17
| * | | | | | | | apply: hoist use_patch() helper for path exclusion upJunio C Hamano2014-08-071-38/+43