summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/status-auto-comment-char'Junio C Hamano2014-06-061-0/+32
|\
| * commit: allow core.commentChar=auto for character auto selectionnd/status-auto-comment-charNguyễn Thái Ngọc Duy2014-05-191-0/+32
* | Merge branch 'sk/spawn-less-case-insensitively-from-grep-O-i'Junio C Hamano2014-06-061-0/+3
|\ \
| * | git grep -O -i: if the pager is 'less', pass the '-I' optionsk/spawn-less-case-insensitively-from-grep-O-iJohannes Schindelin2014-05-151-0/+3
* | | Merge branch 'jk/index-pack-report-missing'Junio C Hamano2014-06-061-2/+7
|\ \ \
| * | | index-pack: distinguish missing objects from type errorsjk/index-pack-report-missingJeff King2014-05-121-2/+7
* | | | Merge branch 'bc/blame-crlf-test'Junio C Hamano2014-06-061-1/+0
|\ \ \ \
| * | | | blame: correctly handle files regardless of autocrlfbc/blame-crlf-testbrian m. carlson2014-05-081-1/+0
* | | | | Merge branch 'dk/blame-reorg'Junio C Hamano2014-06-061-298/+567
|\ \ \ \ \
| * | | | | blame: large-scale performance rewritedk/blame-reorgDavid Kastrup2014-04-281-298/+567
| | |_|_|/ | |/| | |
* | | | | Merge branch 'dt/merge-recursive-case-insensitive'Junio C Hamano2014-06-061-1/+2
|\ \ \ \ \
| * | | | | mv: allow renaming to fix case on case insensitive filesystemsdt/merge-recursive-case-insensitiveDavid Turner2014-05-081-1/+2
| | |_|/ / | |/| | |
* | | | | Merge branch 'rs/reflog-exists'Junio C Hamano2014-06-062-7/+3
|\ \ \ \ \
| * | | | | checkout.c: use ref_exists instead of file_existrs/reflog-existsRonnie Sahlberg2014-05-081-4/+1
| * | | | | refs.c: add new functions reflog_exists and delete_reflogRonnie Sahlberg2014-05-082-5/+4
| | |/ / / | |/| | |
* | | | | Merge branch 'tg/tag-state-tag-name-in-editor-hints'Junio C Hamano2014-06-061-4/+4
|\ \ \ \ \
| * | | | | builtin/tag.c: show tag name to hint in the message editortg/tag-state-tag-name-in-editor-hintsThorsten Glaser2014-05-071-4/+4
| | |/ / / | |/| | |
* | | | | Merge branch 'jk/grep-tell-run-command-to-cd-when-running-pager'Junio C Hamano2014-06-061-3/+1
|\ \ \ \ \
| * | | | | grep: use run-command's "dir" option for --open-files-in-pagerjk/grep-tell-run-command-to-cd-when-running-pagerJeff King2014-05-071-3/+1
| |/ / / /
| * | | | Merge branch 'jl/nor-or-nand-and' into maintJunio C Hamano2014-04-096-8/+8
| |\ \ \ \
| * \ \ \ \ Merge branch 'mh/update-ref-batch-create-fix' into maintJunio C Hamano2014-04-091-0/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'bp/commit-p-editor' into maintJunio C Hamano2014-04-085-17/+38
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/mv-submodules-fix' into maintJunio C Hamano2014-04-031-0/+9
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'nd/index-pack-error-message' into maintJunio C Hamano2014-04-031-2/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/shallow-update-fix' into maintJunio C Hamano2014-04-031-12/+4
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'fc/status-printf-squelch-format-zero-length-warnings'Junio C Hamano2014-06-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | silence a bunch of format-zero-length warningsfc/status-printf-squelch-format-zero-length-warningsFelipe Contreras2014-05-071-1/+1
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/commit-C-pick-empty'Junio C Hamano2014-06-061-3/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | commit: do not complain of empty messages from -Cjk/commit-C-pick-emptyJeff King2014-04-281-3/+2
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jk/commit-date-approxidate'Junio C Hamano2014-06-031-19/+60
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | commit: accept more date formats for "--date"Jeff King2014-05-021-2/+25
| * | | | | | | | | | | commit: print "Date" line when the user has set dateJeff King2014-05-021-0/+19
| * | | | | | | | | | | commit: use split_ident_line to compare author/committerJeff King2014-05-021-17/+16
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'fc/rerere-conflict-style'Junio C Hamano2014-06-031-0/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | rerere: fix for merge.conflictstylefc/rerere-conflict-styleFelipe Contreras2014-04-301-0/+2
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'sk/tag-contains-wo-recursion'Junio C Hamano2014-06-031-15/+75
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git tag --contains: avoid stack overflowJean-Jacques Lafay2014-04-251-15/+75
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jx/blame-align-relative-time'Junio C Hamano2014-06-031-8/+22
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | blame: dynamic blame_date_width for different localesjx/blame-align-relative-timeJiang Xin2014-04-231-1/+8
| * | | | | | | | | | | blame: fix broken time_buf paddings in relative timestampJiang Xin2014-04-231-7/+14
* | | | | | | | | | | | Merge branch 'fc/merge-default-to-upstream'Junio C Hamano2014-06-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | merge: enable defaulttoupstream by defaultfc/merge-default-to-upstreamFelipe Contreras2014-04-221-1/+1
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'rs/ref-update-check-errors-early'Junio C Hamano2014-06-031-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | commit.c: check for lock error and return earlyrs/ref-update-check-errors-earlyRonnie Sahlberg2014-04-171-4/+4
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'nd/index-pack-one-fd-per-thread'Junio C Hamano2014-06-031-10/+17
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | index-pack: work around thread-unsafe pread()nd/index-pack-one-fd-per-threadNguyễn Thái Ngọc Duy2014-04-161-10/+17
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'ym/fix-opportunistic-index-update-race'Junio C Hamano2014-06-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | wrapper.c: add xpread() similar to xread()Yiannis Marangos2014-04-101-1/+1
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'mh/ref-transaction'Junio C Hamano2014-06-036-178/+277
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | update-ref --stdin: reimplement using reference transactionsMichael Haggerty2014-04-071-67/+75