summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/gc-lock-against-each-other'Junio C Hamano2013-09-043-1/+78
|\
| * gc: reject if another gc is running, unless --force is givenNguyễn Thái Ngọc Duy2013-08-093-1/+78
* | Merge branch 'ap/remote-hg-tilde-is-home-directory'Junio C Hamano2013-09-041-1/+1
|\ \
| * | remote-hg: fix path when cloning with tilde expansionap/remote-hg-tilde-is-home-directoryAntoine Pelisse2013-08-091-1/+1
* | | Merge branch 'mm/no-shell-escape-in-die-message'Junio C Hamano2013-09-042-1/+14
|\ \ \
| * | | die_with_status: use "printf '%s\n'", not "echo"mm/no-shell-escape-in-die-messageMatthieu Moy2013-08-072-1/+14
* | | | Merge branch 'tr/fd-gotcha-fixes'Junio C Hamano2013-09-041-0/+4
|\ \ \ \
| * | | | t0070: test that git_mkstemps correctly checks return value of open()tr/fd-gotcha-fixesDale R. Worley2013-08-061-0/+4
* | | | | Merge branch 'bc/unuse-packfile'Junio C Hamano2013-09-043-17/+87
|\ \ \ \ \
| * | | | | Don't close pack fd when free'ing pack windowsbc/unuse-packfileBrandon Casey2013-08-023-16/+9
| * | | | | sha1_file: introduce close_one_pack() to close packs on fd pressureBrandon Casey2013-08-021-1/+78
| | |_|_|/ | |/| | |
* | | | | Merge branch 'da/darwin'Junio C Hamano2013-09-044-14/+99
|\ \ \ \ \
| * | | | | 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