summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs/pop-commit'Junio C Hamano2015-10-3010-92/+31
|\
| * use pop_commit() for consuming the first entry of a struct commit_listrs/pop-commitRené Scharfe2015-10-2610-92/+31
* | Merge branch 'mk/blame-error-message'Junio C Hamano2015-10-301-1/+1
|\ \
| * | blame: fix option name in error messagemk/blame-error-messageMax Kirillov2015-10-261-1/+1
* | | Merge branch 'js/misc-fixes'Junio C Hamano2015-10-305-6/+12
|\ \ \
| * | | Correct fscanf formatting string for I64u valuesjs/misc-fixesWaldek Maleska2015-10-262-1/+5
| * | | Silence GCC's "cast of pointer to integer of a different size" warningJohannes Schindelin2015-10-263-4/+6
| * | | Squelch warning about an integer overflowJohannes Schindelin2015-10-261-1/+1
| |/ /
* | | Merge branch 'js/imap-send-curl-compilation-fix'Junio C Hamano2015-10-301-0/+4
|\ \ \
| * | | imap-send: only use CURLOPT_LOGIN_OPTIONS if it is actually availablejs/imap-send-curl-compilation-fixJohannes Schindelin2015-10-261-0/+4
* | | | Merge branch 'jk/delete-modechange-conflict'Junio C Hamano2015-10-305-89/+144
|\ \ \ \
| * | | | merge: detect delete/modechange conflictjk/delete-modechange-conflictJeff King2015-10-263-2/+37
| * | | | t6031: generalize for recursive and resolve strategiesJeff King2015-10-262-56/+77
| * | | | t6031: move triple-rename test to t3030Jeff King2015-10-262-31/+30
| | |/ / | |/| |
* | | | Merge branch 'jc/add-u-A-default-to-top'Junio C Hamano2015-10-303-7/+4
|\ \ \ \
| * | | | add: simplify -u/-A without pathspecjc/add-u-A-default-to-topJunio C Hamano2015-10-243-7/+4
* | | | | Merge branch 'ar/clone-dissociate'Junio C Hamano2015-10-303-10/+26
|\ \ \ \ \
| * | | | | clone: allow "--dissociate" without referencear/clone-dissociateAlex Riesen2015-10-223-10/+26
* | | | | | Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2015-10-3013-531/+450
|\ \ \ \ \ \
| * \ \ \ \ \ Merge https://github.com/vnwildman/gitkPaul Mackerras2015-10-301-22/+23
| |\ \ \ \ \ \
| | * | | | | | Updated Vietnamese translationTrần Ngọc Quân2015-09-151-22/+23
| * | | | | | | gitk: Update Russian translationDimitriy Ryazantcev2015-10-301-239/+160
| * | | | | | | gitk: Add accelerator to German localeTakashi Iwai2015-10-301-18/+18
| * | | | | | | gitk: Add accelerators to Japanese localeTakashi Iwai2015-10-301-17/+17
| * | | | | | | gitk: Update msgid's for menu items with acceleratorTakashi Iwai2015-10-3012-205/+205
| * | | | | | | gitk: l10n: Update Catalan translationAlex Henrie2015-10-301-28/+25
| * | | | | | | gitk: Add missing acceleratorsBeat Bolli2015-10-301-2/+2
| |/ / / / / /
* | | | | | | Eighth batch for 2.7Junio C Hamano2015-10-291-1/+24
* | | | | | | Merge branch 'jc/am-mailinfo-direct'Junio C Hamano2015-10-291-19/+23
|\ \ \ \ \ \ \
| * | | | | | | am: make direct call to mailinfojc/am-mailinfo-directJunio C Hamano2015-10-211-19/+23
* | | | | | | | Merge branch 'jc/mailinfo-lib'Junio C Hamano2015-10-294-1035/+1099
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | mailinfo: remove calls to exit() and die() deep in the callchainJunio C Hamano2015-10-212-8/+23
| * | | | | | | mailinfo: handle charset conversion errors in the callerJunio C Hamano2015-10-211-8/+11
| * | | | | | | mailinfo: libifyJunio C Hamano2015-10-214-1048/+1062
| * | | | | | | mailinfo: keep the parsed log message in a strbufJunio C Hamano2015-10-211-12/+16
| * | | | | | | mailinfo: handle_commit_msg() shouldn't be called after finding patchbreakJunio C Hamano2015-10-211-2/+1
| * | | | | | | mailinfo: move content/content_top to struct mailinfoJunio C Hamano2015-10-211-20/+26
| * | | | | | | mailinfo: move [ps]_hdr_data to struct mailinfoJunio C Hamano2015-10-211-14/+23
| * | | | | | | mailinfo: move cmitmsg and patchfile to struct mailinfoJunio C Hamano2015-10-211-16/+16
| * | | | | | | mailinfo: move charset to struct mailinfoJunio C Hamano2015-10-211-7/+8
| * | | | | | | mailinfo: move transfer_encoding to struct mailinfoJunio C Hamano2015-10-211-13/+14
| * | | | | | | mailinfo: move check for metainfo_charset to convert_to_utf8()Junio C Hamano2015-10-211-5/+3
| * | | | | | | mailinfo: move metainfo_charset to struct mailinfoJunio C Hamano2015-10-211-19/+19
| * | | | | | | mailinfo: move use_scissors and use_inbody_headers to struct mailinfoJunio C Hamano2015-10-211-10/+13
| * | | | | | | mailinfo: move add_message_id and message_id to struct mailinfoJunio C Hamano2015-10-211-14/+17
| * | | | | | | mailinfo: move patch_lines to struct mailinfoJunio C Hamano2015-10-211-5/+5
| * | | | | | | mailinfo: move filter/header stage to struct mailinfoJunio C Hamano2015-10-211-20/+21
| * | | | | | | mailinfo: move global "FILE *fin, *fout" to struct mailinfoJunio C Hamano2015-10-211-26/+28
| * | | | | | | mailinfo: move keep_subject & keep_non_patch_bracket to struct mailinfoJunio C Hamano2015-10-211-8/+8
| * | | | | | | mailinfo: introduce "struct mailinfo" to hold globalsJunio C Hamano2015-10-211-24/+47
View Lorry Controller Status