summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | OS X: Fix redeclaration of die warningda/darwinBrian Gernhardt2013-08-051-10/+10
| * | | | | | | | | | | | | | | | Makefile: Fix APPLE_COMMON_CRYPTO with BLK_SHA1Brian Gernhardt2013-08-051-1/+3
| * | | | | | | | | | | | | | | | imap-send: use Apple's Security framework for base64 encodingJeremy Huddleston2013-07-304-14/+98
* | | | | | | | | | | | | | | | | Merge branch 'nd/sq-quote-buf'Junio C Hamano2013-09-044-54/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | quote: remove sq_quote_print()nd/sq-quote-bufRamkumar Ramachandra2013-07-302-19/+0
| * | | | | | | | | | | | | | | | | tar-tree: remove dependency on sq_quote_print()Ramkumar Ramachandra2013-07-301-6/+5
| * | | | | | | | | | | | | | | | | for-each-ref, quote: convert *_quote_print -> *_quote_bufNguyễn Thái Ngọc Duy2013-07-303-29/+34
* | | | | | | | | | | | | | | | | | Merge branch 'rr/feed-real-path-to-editor'Junio C Hamano2013-09-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | editor: use canonicalized absolute pathrr/feed-real-path-to-editorRamkumar Ramachandra2013-07-291-1/+1
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/fast-import-empty-ls'Junio C Hamano2013-09-042-20/+103
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | fast-import: allow moving the root treejk/fast-import-empty-lsJohn Keeping2013-06-232-8/+15
| * | | | | | | | | | | | | | | | | | | fast-import: allow ls or filecopy of the root treeJohn Keeping2013-06-232-15/+24
| * | | | | | | | | | | | | | | | | | | fast-import: set valid mode on root tree in "ls"John Keeping2013-06-231-0/+2
| * | | | | | | | | | | | | | | | | | | t9300: document fast-import empty path issuesJohn Keeping2013-06-231-0/+65
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'km/svn-1.8-serf-only'Junio C Hamano2013-09-042-3/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Git.pm: revert _temp_cache use of temp_is_lockedkm/svn-1.8-serf-onlyKyle J. McKay2013-07-181-1/+1
| * | | | | | | | | | | | | | | | | | | git-svn: allow git-svn fetching to work using serfKyle J. McKay2013-07-071-2/+4
| * | | | | | | | | | | | | | | | | | | Git.pm: add new temp_is_locked functionKyle J. McKay2013-07-071-2/+31
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch 'jc/check-x-z'Junio C Hamano2013-09-043-14/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | check-attr -z: a single -z should apply to both input and outputjc/check-x-zJunio C Hamano2013-07-112-5/+18
| * | | | | | | | | | | | | | | | | | | check-ignore -z: a single -z should apply to both input and outputJunio C Hamano2013-07-111-1/+1
| * | | | | | | | | | | | | | | | | | | check-attr: the name of the character is NUL, not NULLJunio C Hamano2013-07-111-4/+4
| * | | | | | | | | | | | | | | | | | | check-ignore: the name of the character is NUL, not NULLJunio C Hamano2013-07-111-6/+6
* | | | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2013-09-033-718/+875
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge git://github.com/git-l10n/git-po into maintJunio C Hamano2013-09-032-718/+874
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | l10n: fr.po: hotfix for commit 6b388fcSebastien Helleu2013-08-302-718/+874
| * | | | | | | | | | | | | | | | | | | | Merge branch 'maint-1.8.3' into maintJunio C Hamano2013-09-031-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | / / / / | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge branch 'maint-1.8.2' into maint-1.8.3Junio C Hamano2013-09-031-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | fix shell syntax error in templateThorsten Glaser2013-08-301-0/+1
| | | | |_|_|_|_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Start the post-1.8.4 cycleJunio C Hamano2013-08-303-2/+88
* | | | | | | | | | | | | | | | | | | Merge branch 'bc/completion-for-bash-3.0'Junio C Hamano2013-08-303-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | contrib/git-prompt.sh: handle missing 'printf -v' more gracefullybc/completion-for-bash-3.0Brandon Casey2013-08-221-1/+5
| * | | | | | | | | | | | | | | | | | | t9902-completion.sh: old Bash still does not support array+=('') notationBrandon Casey2013-08-211-1/+1
| * | | | | | | | | | | | | | | | | | | git-completion.bash: use correct Bash/Zsh array length syntaxBrandon Casey2013-08-211-1/+1
* | | | | | | | | | | | | | | | | | | | Merge branch 'sp/doc-smart-http'Junio C Hamano2013-08-301-0/+503
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Document the HTTP transport protocolssp/doc-smart-httpShawn O. Pearce2013-08-211-0/+503
| |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge branch 'mm/war-on-whatchanged'Junio C Hamano2013-08-305-70/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | whatchanged: document its historical naturemm/war-on-whatchangedJunio C Hamano2013-08-131-33/+7
| * | | | | | | | | | | | | | | | | | | | core-tutorial: trim the section on Inspecting ChangesJunio C Hamano2013-08-134-37/+47
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'rt/doc-merge-file-diff3'Junio C Hamano2013-08-301-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Documentation/git-merge-file: document option "--diff3"rt/doc-merge-file-diff3Ralf Thielow2013-08-091-1/+4
| | |_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'mb/docs-favor-en-us'Junio C Hamano2013-08-302-1/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Provide some linguistic guidance for the documentation.mb/docs-favor-en-usMarc Branchaud2013-08-012-1/+22
* | | | | | | | | | | | | | | | | | | | | Merge branch 'rj/doc-rev-parse'Junio C Hamano2013-08-302-55/+77
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | rev-parse(1): logically group optionsrj/doc-rev-parseJohn Keeping2013-07-221-40/+64
| * | | | | | | | | | | | | | | | | | | | | rev-parse: remove restrictions on some optionsJohn Keeping2013-07-221-15/+13
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'hv/config-from-blob'Junio C Hamano2013-08-301-16/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | config: do not use C function names as struct membershv/config-from-blobJeff King2013-08-261-16/+16
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/fetch-pack-shallow-fix'Junio C Hamano2013-08-302-1/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | fetch-pack: do not remove .git/shallow file when --depth is not specifiednd/fetch-pack-shallow-fixNguyễn Thái Ngọc Duy2013-08-252-1/+19
| | |_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |