Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'nd/gc-lock-against-each-other' | Junio C Hamano | 2013-09-04 | 3 | -1/+78 |
|\ | |||||
| * | gc: reject if another gc is running, unless --force is given | Nguyễn Thái Ngọc Duy | 2013-08-09 | 3 | -1/+78 |
* | | Merge branch 'ap/remote-hg-tilde-is-home-directory' | Junio C Hamano | 2013-09-04 | 1 | -1/+1 |
|\ \ | |||||
| * | | remote-hg: fix path when cloning with tilde expansionap/remote-hg-tilde-is-home-directory | Antoine Pelisse | 2013-08-09 | 1 | -1/+1 |
* | | | Merge branch 'mm/no-shell-escape-in-die-message' | Junio C Hamano | 2013-09-04 | 2 | -1/+14 |
|\ \ \ | |||||
| * | | | die_with_status: use "printf '%s\n'", not "echo"mm/no-shell-escape-in-die-message | Matthieu Moy | 2013-08-07 | 2 | -1/+14 |
* | | | | Merge branch 'tr/fd-gotcha-fixes' | Junio C Hamano | 2013-09-04 | 1 | -0/+4 |
|\ \ \ \ | |||||
| * | | | | t0070: test that git_mkstemps correctly checks return value of open()tr/fd-gotcha-fixes | Dale R. Worley | 2013-08-06 | 1 | -0/+4 |
* | | | | | Merge branch 'bc/unuse-packfile' | Junio C Hamano | 2013-09-04 | 3 | -17/+87 |
|\ \ \ \ \ | |||||
| * | | | | | Don't close pack fd when free'ing pack windowsbc/unuse-packfile | Brandon Casey | 2013-08-02 | 3 | -16/+9 |
| * | | | | | sha1_file: introduce close_one_pack() to close packs on fd pressure | Brandon Casey | 2013-08-02 | 1 | -1/+78 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'da/darwin' | Junio C Hamano | 2013-09-04 | 4 | -14/+99 |
|\ \ \ \ \ | |||||
| * | | | | | OS X: Fix redeclaration of die warningda/darwin | Brian Gernhardt | 2013-08-05 | 1 | -10/+10 |
| * | | | | | Makefile: Fix APPLE_COMMON_CRYPTO with BLK_SHA1 | Brian Gernhardt | 2013-08-05 | 1 | -1/+3 |
| * | | | | | imap-send: use Apple's Security framework for base64 encoding | Jeremy Huddleston | 2013-07-30 | 4 | -14/+98 |
* | | | | | | Merge branch 'nd/sq-quote-buf' | Junio C Hamano | 2013-09-04 | 4 | -54/+39 |
|\ \ \ \ \ \ | |||||
| * | | | | | | quote: remove sq_quote_print()nd/sq-quote-buf | Ramkumar Ramachandra | 2013-07-30 | 2 | -19/+0 |
| * | | | | | | tar-tree: remove dependency on sq_quote_print() | Ramkumar Ramachandra | 2013-07-30 | 1 | -6/+5 |
| * | | | | | | for-each-ref, quote: convert *_quote_print -> *_quote_buf | Nguyễn Thái Ngọc Duy | 2013-07-30 | 3 | -29/+34 |
* | | | | | | | Merge branch 'rr/feed-real-path-to-editor' | Junio C Hamano | 2013-09-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | editor: use canonicalized absolute pathrr/feed-real-path-to-editor | Ramkumar Ramachandra | 2013-07-29 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'jk/fast-import-empty-ls' | Junio C Hamano | 2013-09-04 | 2 | -20/+103 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fast-import: allow moving the root treejk/fast-import-empty-ls | John Keeping | 2013-06-23 | 2 | -8/+15 |
| * | | | | | | | | fast-import: allow ls or filecopy of the root tree | John Keeping | 2013-06-23 | 2 | -15/+24 |
| * | | | | | | | | fast-import: set valid mode on root tree in "ls" | John Keeping | 2013-06-23 | 1 | -0/+2 |
| * | | | | | | | | t9300: document fast-import empty path issues | John Keeping | 2013-06-23 | 1 | -0/+65 |
* | | | | | | | | | Merge branch 'km/svn-1.8-serf-only' | Junio C Hamano | 2013-09-04 | 2 | -3/+34 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Git.pm: revert _temp_cache use of temp_is_lockedkm/svn-1.8-serf-only | Kyle J. McKay | 2013-07-18 | 1 | -1/+1 |
| * | | | | | | | | | git-svn: allow git-svn fetching to work using serf | Kyle J. McKay | 2013-07-07 | 1 | -2/+4 |
| * | | | | | | | | | Git.pm: add new temp_is_locked function | Kyle J. McKay | 2013-07-07 | 1 | -2/+31 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'jc/check-x-z' | Junio C Hamano | 2013-09-04 | 3 | -14/+27 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | check-attr -z: a single -z should apply to both input and outputjc/check-x-z | Junio C Hamano | 2013-07-11 | 2 | -5/+18 |
| * | | | | | | | | | check-ignore -z: a single -z should apply to both input and output | Junio C Hamano | 2013-07-11 | 1 | -1/+1 |
| * | | | | | | | | | check-attr: the name of the character is NUL, not NULL | Junio C Hamano | 2013-07-11 | 1 | -4/+4 |
| * | | | | | | | | | check-ignore: the name of the character is NUL, not NULL | Junio C Hamano | 2013-07-11 | 1 | -6/+6 |
* | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2013-09-03 | 3 | -718/+875 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge git://github.com/git-l10n/git-po into maint | Junio C Hamano | 2013-09-03 | 2 | -718/+874 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | l10n: fr.po: hotfix for commit 6b388fc | Sebastien Helleu | 2013-08-30 | 2 | -718/+874 |
| * | | | | | | | | | | | Merge branch 'maint-1.8.3' into maint | Junio C Hamano | 2013-09-03 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge branch 'maint-1.8.2' into maint-1.8.3 | Junio C Hamano | 2013-09-03 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | fix shell syntax error in template | Thorsten Glaser | 2013-08-30 | 1 | -0/+1 |
| | | | |_|_|_|_|/ / / / | | | |/| | | | | | | | | |||||
* | | | | | | | | | | | | Start the post-1.8.4 cycle | Junio C Hamano | 2013-08-30 | 3 | -2/+88 |
* | | | | | | | | | | | | Merge branch 'bc/completion-for-bash-3.0' | Junio C Hamano | 2013-08-30 | 3 | -3/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | contrib/git-prompt.sh: handle missing 'printf -v' more gracefullybc/completion-for-bash-3.0 | Brandon Casey | 2013-08-22 | 1 | -1/+5 |
| * | | | | | | | | | | | | t9902-completion.sh: old Bash still does not support array+=('') notation | Brandon Casey | 2013-08-21 | 1 | -1/+1 |
| * | | | | | | | | | | | | git-completion.bash: use correct Bash/Zsh array length syntax | Brandon Casey | 2013-08-21 | 1 | -1/+1 |
* | | | | | | | | | | | | | Merge branch 'sp/doc-smart-http' | Junio C Hamano | 2013-08-30 | 1 | -0/+503 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Document the HTTP transport protocolssp/doc-smart-http | Shawn O. Pearce | 2013-08-21 | 1 | -0/+503 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge branch 'mm/war-on-whatchanged' | Junio C Hamano | 2013-08-30 | 5 | -70/+54 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | whatchanged: document its historical naturemm/war-on-whatchanged | Junio C Hamano | 2013-08-13 | 1 | -33/+7 |