aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'mh/ref-iterators'Junio C Hamano2016-07-25
|\
| * remote rm: handle symbolic refs correctlyMichael Haggerty2016-06-20
| * delete_refs(): add a flags argumentMichael Haggerty2016-06-20
* | Merge branch 'mh/split-under-lock'Junio C Hamano2016-07-25
|\ \ | |/
| * delete_branches(): use resolve_refdup()Michael Haggerty2016-06-13
* | Merge branch 'js/am-call-theirs-theirs-in-fallback-3way'Junio C Hamano2016-07-19
|\ \
| * | am: counteract gender biasJohannes Schindelin2016-07-08
* | | Merge branch 'jk/write-file'Junio C Hamano2016-07-19
|\ \ \
| * | | branch: use write_file_buf instead of write_fileJeff King2016-07-08
| * | | use write_file_buf where applicableJeff King2016-07-08
| * | | branch: use non-gentle write_file for branch descriptionJeff King2016-07-08
| * | | am: ignore return value of write_file()René Scharfe2016-07-08
| * | | config: fix bogus fd check when setting up default configJeff King2016-07-08
* | | | Merge branch 'jk/printf-format'Junio C Hamano2016-07-19
|\ \ \ \
| * | | | avoid using sha1_to_hex output as printf formatJeff King2016-07-08
* | | | | Merge branch 'nd/fetch-ref-summary'Junio C Hamano2016-07-19
|\ \ \ \ \
| * | | | | fetch: reduce duplicate in ref update status lines with placeholderNguyễn Thái Ngọc Duy2016-07-06
| * | | | | fetch: align all "remote -> local" outputNguyễn Thái Ngọc Duy2016-07-06
| * | | | | fetch: change flag code for displaying tag update and deleted refNguyễn Thái Ngọc Duy2016-06-27
| * | | | | fetch: refactor ref update status formatting codeNguyễn Thái Ngọc Duy2016-06-27
| | |/ / / | |/| | |
* | | | | Merge branch 'bc/cocci'Junio C Hamano2016-07-19
|\ \ \ \ \
| * | | | | merge-recursive: convert merge_recursive_generic() to object_idbrian m. carlson2016-06-28
| * | | | | diff: convert struct diff_filespec to struct object_idbrian m. carlson2016-06-28
| * | | | | coccinelle: apply object_id Coccinelle transformationsbrian m. carlson2016-06-28
| * | | | | coccinelle: convert hashcpy() with null_sha1 to hashclr()brian m. carlson2016-06-28
| |/ / / /
* | | | | Merge branch 'js/log-to-diffopt-file'Junio C Hamano2016-07-19
|\ \ \ \ \
| * | | | | shortlog: respect the --output=<file> settingJohannes Schindelin2016-06-24
| * | | | | format-patch: use stdout directlyJohannes Schindelin2016-06-24
| * | | | | format-patch: avoid freopen()Johannes Schindelin2016-06-24
| * | | | | format-patch: explicitly switch off color when writing to filesJohannes Schindelin2016-06-24
| * | | | | shortlog: support outputting to streams other than stdoutJohannes Schindelin2016-06-24
| * | | | | log: prepare log/log-tree to reuse the diffopt.close_file attributeJohannes Schindelin2016-06-24
* | | | | | Merge branch 'dk/blame-move-no-reason-for-1-line-context'Junio C Hamano2016-07-19
|\ \ \ \ \ \
| * | | | | | blame: require 0 context lines while finding moved lines with -MDavid Kastrup2016-05-29
* | | | | | | Merge branch 'nd/ita-cleanup'Junio C Hamano2016-07-13
|\ \ \ \ \ \ \
| * | | | | | | grep: fix grepping for "intent to add" filesCharles Bailey2016-07-01
* | | | | | | | Merge branch 'ew/gc-auto-pack-limit-fix'Junio C Hamano2016-07-13
|\ \ \ \ \ \ \ \
| * | | | | | | | gc: fix off-by-one error with gc.autoPackLimitEric Wong2016-06-27
* | | | | | | | | Merge branch 'va/i18n-even-more'Junio C Hamano2016-07-13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | i18n: branch: mark comment when editing branch description for translationVasco Almeida2016-06-17
| * | | | | | | | | i18n: init-db: join message piecesVasco Almeida2016-06-17
| * | | | | | | | | i18n: remote: allow translations to reorder messageVasco Almeida2016-06-17
| * | | | | | | | | i18n: remote: mark URL fallback text for translationVasco Almeida2016-06-17
| * | | | | | | | | i18n: standardise messagesVasco Almeida2016-06-17
| * | | | | | | | | i18n: merge: change command option help to lowercaseVasco Almeida2016-06-17
| * | | | | | | | | i18n: merge: mark messages for translationVasco Almeida2016-06-17
| * | | | | | | | | i18n: notes: mark options for translationVasco Almeida2016-06-17
| * | | | | | | | | i18n: notes: mark strings for translationVasco Almeida2016-06-17
| * | | | | | | | | i18n: advice: internationalize message for conflictsVasco Almeida2016-06-17
| * | | | | | | | | i18n: builtin/remote.c: fix mark for translationVasco Almeida2016-06-17
| | |_|/ / / / / / | |/| | | | | | |