Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | http: use off_t to store partial file sizedt/http-range | Jeff King | 2015-11-02 | 1 | -4/+4 |
* | http.c: use CURLOPT_RANGE for range requests | David Turner | 2015-11-02 | 2 | -22/+12 |
* | Ninth batch for 2.7 | Junio C Hamano | 2015-10-30 | 1 | -2/+31 |
* | Merge branch 'jk/merge-file-exit-code' | Junio C Hamano | 2015-10-30 | 3 | -1/+38 |
|\ | |||||
| * | merge-file: clamp exit code to maximum 127jk/merge-file-exit-code | Jeff King | 2015-10-29 | 3 | -1/+38 |
* | | Merge branch 'gr/rebase-i-drop-warn' | Junio C Hamano | 2015-10-30 | 2 | -0/+24 |
|\ \ | |||||
| * | | rebase-i: work around Windows CRLF line endingsgr/rebase-i-drop-warn | Junio C Hamano | 2015-10-28 | 2 | -1/+13 |
| * | | t3404: "rebase -i" gets broken when insn sheet uses CR/LF line endings | Johannes Schindelin | 2015-10-28 | 1 | -0/+12 |
* | | | Merge branch 'xf/user-manual-ff' | Junio C Hamano | 2015-10-30 | 1 | -5/+5 |
|\ \ \ | |||||
| * | | | user-manual: fix the description of fast-forwardxf/user-manual-ff | Xue Fuqiao | 2015-10-26 | 1 | -5/+5 |
| | |/ | |/| | |||||
* | | | Merge branch 'rs/pop-commit' | Junio C Hamano | 2015-10-30 | 10 | -92/+31 |
|\ \ \ | |||||
| * | | | use pop_commit() for consuming the first entry of a struct commit_listrs/pop-commit | René Scharfe | 2015-10-26 | 10 | -92/+31 |
* | | | | Merge branch 'mk/blame-error-message' | Junio C Hamano | 2015-10-30 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | blame: fix option name in error messagemk/blame-error-message | Max Kirillov | 2015-10-26 | 1 | -1/+1 |
* | | | | | Merge branch 'js/misc-fixes' | Junio C Hamano | 2015-10-30 | 5 | -6/+12 |
|\ \ \ \ \ | |||||
| * | | | | | Correct fscanf formatting string for I64u valuesjs/misc-fixes | Waldek Maleska | 2015-10-26 | 2 | -1/+5 |
| * | | | | | Silence GCC's "cast of pointer to integer of a different size" warning | Johannes Schindelin | 2015-10-26 | 3 | -4/+6 |
| * | | | | | Squelch warning about an integer overflow | Johannes Schindelin | 2015-10-26 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge branch 'js/imap-send-curl-compilation-fix' | Junio C Hamano | 2015-10-30 | 1 | -0/+4 |
|\ \ \ \ \ | |||||
| * | | | | | imap-send: only use CURLOPT_LOGIN_OPTIONS if it is actually availablejs/imap-send-curl-compilation-fix | Johannes Schindelin | 2015-10-26 | 1 | -0/+4 |
* | | | | | | Merge branch 'jk/delete-modechange-conflict' | Junio C Hamano | 2015-10-30 | 5 | -89/+144 |
|\ \ \ \ \ \ | |||||
| * | | | | | | merge: detect delete/modechange conflictjk/delete-modechange-conflict | Jeff King | 2015-10-26 | 3 | -2/+37 |
| * | | | | | | t6031: generalize for recursive and resolve strategies | Jeff King | 2015-10-26 | 2 | -56/+77 |
| * | | | | | | t6031: move triple-rename test to t3030 | Jeff King | 2015-10-26 | 2 | -31/+30 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'jc/add-u-A-default-to-top' | Junio C Hamano | 2015-10-30 | 3 | -7/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | add: simplify -u/-A without pathspecjc/add-u-A-default-to-top | Junio C Hamano | 2015-10-24 | 3 | -7/+4 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'ar/clone-dissociate' | Junio C Hamano | 2015-10-30 | 3 | -10/+26 |
|\ \ \ \ \ \ | |||||
| * | | | | | | clone: allow "--dissociate" without referencear/clone-dissociate | Alex Riesen | 2015-10-22 | 3 | -10/+26 |
* | | | | | | | Merge git://ozlabs.org/~paulus/gitk | Junio C Hamano | 2015-10-30 | 13 | -531/+450 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge https://github.com/vnwildman/gitk | Paul Mackerras | 2015-10-30 | 1 | -22/+23 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Updated Vietnamese translation | Trần Ngọc Quân | 2015-09-15 | 1 | -22/+23 |
| * | | | | | | | | gitk: Update Russian translation | Dimitriy Ryazantcev | 2015-10-30 | 1 | -239/+160 |
| * | | | | | | | | gitk: Add accelerator to German locale | Takashi Iwai | 2015-10-30 | 1 | -18/+18 |
| * | | | | | | | | gitk: Add accelerators to Japanese locale | Takashi Iwai | 2015-10-30 | 1 | -17/+17 |
| * | | | | | | | | gitk: Update msgid's for menu items with accelerator | Takashi Iwai | 2015-10-30 | 12 | -205/+205 |
| * | | | | | | | | gitk: l10n: Update Catalan translation | Alex Henrie | 2015-10-30 | 1 | -28/+25 |
| * | | | | | | | | gitk: Add missing accelerators | Beat Bolli | 2015-10-30 | 1 | -2/+2 |
| |/ / / / / / / | |||||
* | | | | | | | | Eighth batch for 2.7 | Junio C Hamano | 2015-10-29 | 1 | -1/+24 |
* | | | | | | | | Merge branch 'jc/am-mailinfo-direct' | Junio C Hamano | 2015-10-29 | 1 | -19/+23 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | am: make direct call to mailinfojc/am-mailinfo-direct | Junio C Hamano | 2015-10-21 | 1 | -19/+23 |
* | | | | | | | | | Merge branch 'jc/mailinfo-lib' | Junio C Hamano | 2015-10-29 | 4 | -1035/+1099 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | mailinfo: remove calls to exit() and die() deep in the callchain | Junio C Hamano | 2015-10-21 | 2 | -8/+23 |
| * | | | | | | | | mailinfo: handle charset conversion errors in the caller | Junio C Hamano | 2015-10-21 | 1 | -8/+11 |
| * | | | | | | | | mailinfo: libify | Junio C Hamano | 2015-10-21 | 4 | -1048/+1062 |
| * | | | | | | | | mailinfo: keep the parsed log message in a strbuf | Junio C Hamano | 2015-10-21 | 1 | -12/+16 |
| * | | | | | | | | mailinfo: handle_commit_msg() shouldn't be called after finding patchbreak | Junio C Hamano | 2015-10-21 | 1 | -2/+1 |
| * | | | | | | | | mailinfo: move content/content_top to struct mailinfo | Junio C Hamano | 2015-10-21 | 1 | -20/+26 |
| * | | | | | | | | mailinfo: move [ps]_hdr_data to struct mailinfo | Junio C Hamano | 2015-10-21 | 1 | -14/+23 |
| * | | | | | | | | mailinfo: move cmitmsg and patchfile to struct mailinfo | Junio C Hamano | 2015-10-21 | 1 | -16/+16 |
| * | | | | | | | | mailinfo: move charset to struct mailinfo | Junio C Hamano | 2015-10-21 | 1 | -7/+8 |