summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/gc-with-stale-symref'Junio C Hamano2015-10-152-1/+20
|\
| * pack-objects: do not get distracted by broken symrefsjs/gc-with-stale-symrefJohannes Schindelin2015-10-082-2/+8
| * gc: demonstrate failure with stale remote HEADJohannes Schindelin2015-10-051-0/+13
* | Merge branch 'js/clone-dissociate'Junio C Hamano2015-10-154-23/+62
|\ \
| * | clone --dissociate: avoid locking pack filesjs/clone-dissociateJohannes Schindelin2015-10-072-2/+4
| * | sha1_file.c: add a function to release all packsJohannes Schindelin2015-10-072-3/+21
| * | sha1_file: consolidate code to close a pack's file descriptorJohannes Schindelin2015-10-051-20/+18
| * | t5700: demonstrate a Windows file locking issue with `git clone --dissociate`Johannes Schindelin2015-10-051-0/+21
| |/
* | Merge branch 'tk/doc-interpret-trailers-grammo'Junio C Hamano2015-10-151-1/+1
|\ \
| * | Documentation/interpret-trailers: Grammar fixtk/doc-interpret-trailers-grammoTobias Klauser2015-10-071-1/+1
* | | Merge branch 'es/worktree-add-cleanup'Junio C Hamano2015-10-151-0/+0
|\ \ \
| * | | t2026: rename worktree prune testes/worktree-add-cleanupMichael J Gruber2015-10-071-0/+0
* | | | Merge branch 'dt/log-follow-config'Junio C Hamano2015-10-152-4/+10
|\ \ \ \
| * | | | log: Update log.follow doc and add to config.txtdt/log-follow-configEric N. Vander Weele2015-10-072-4/+10
* | | | | Merge branch 'cc/quote-comments'Junio C Hamano2015-10-151-5/+6
|\ \ \ \ \
| * | | | | quote: move comment before sq_quote_buf()cc/quote-commentsChristian Couder2015-10-071-5/+5
| * | | | | quote: fix broken sq_quote_buf() related commentChristian Couder2015-10-071-0/+1
* | | | | | Merge branch 'gr/rebase-i-drop-warn'Junio C Hamano2015-10-152-35/+46
|\ \ \ \ \ \
| * | | | | | rebase-i: loosen over-eager check_bad_cmd checkMatthieu Moy2015-10-052-33/+44
| * | | | | | rebase-i: explicitly accept tab as separator in commandsMatthieu Moy2015-10-021-2/+2
* | | | | | | Merge branch 'mm/detach-at-HEAD-reflog'Junio C Hamano2015-10-152-0/+19
|\ \ \ \ \ \ \
| * | | | | | | status: don't say 'HEAD detached at HEAD'mm/detach-at-HEAD-reflogMatthieu Moy2015-10-022-1/+7
| * | | | | | | t3203: test 'detached at' after checkout --detachMatthieu Moy2015-10-021-0/+13
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'sa/send-email-smtp-batch-data-limit'Junio C Hamano2015-10-151-1/+5
|\ \ \ \ \ \ \
| * | | | | | | git-send-email.perl: Fixed sending of many/huge changes/patchessa/send-email-smtp-batch-data-limitStefan Agner2015-09-301-1/+5
* | | | | | | | Merge branch 'pt/am-builtin'Junio C Hamano2015-10-151-1/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | am: configure gpg at startuppt/am-builtinRenee Margaret McConahy2015-09-301-1/+12
* | | | | | | | | Merge branch 'nd/clone-linked-checkout'Junio C Hamano2015-10-154-7/+65
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | clone: better error when --reference is a linked checkoutnd/clone-linked-checkoutNguyễn Thái Ngọc Duy2015-09-281-1/+6
| * | | | | | | | | clone: allow --local from a linked checkoutNguyễn Thái Ngọc Duy2015-09-282-2/+9
| * | | | | | | | | enter_repo: allow .git files in strict modeNguyễn Thái Ngọc Duy2015-09-282-2/+17
| * | | | | | | | | enter_repo: avoid duplicating logic, use is_git_directory() insteadNguyễn Thái Ngọc Duy2015-09-282-2/+15
| * | | | | | | | | t0002: add test for enter_repo(), non-strict modeNguyễn Thái Ngọc Duy2015-09-281-0/+18
| * | | | | | | | | path.c: delete an extra spaceNguyễn Thái Ngọc Duy2015-09-071-1/+1
* | | | | | | | | | Merge branch 'js/icase-wt-detection'Junio C Hamano2015-10-151-1/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | setup: fix "inside work tree" detection on case-insensitive filesystemsjs/icase-wt-detectionJohannes Schindelin2015-09-281-1/+10
* | | | | | | | | | | Merge branch 'kn/for-each-branch'Junio C Hamano2015-10-156-366/+211
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | branch: add '--points-at' optionKarthik Nayak2015-09-253-2/+20
| * | | | | | | | | | | branch.c: use 'ref-filter' APIsKarthik Nayak2015-09-256-192/+78
| * | | | | | | | | | | branch.c: use 'ref-filter' data structuresKarthik Nayak2015-09-252-190/+134
| * | | | | | | | | | | branch: drop non-commit error reportingKarthik Nayak2015-09-251-14/+4
| * | | | | | | | | | | branch: move 'current' check down to the presentation layerKarthik Nayak2015-09-231-11/+9
| * | | | | | | | | | | branch: roll show_detached HEAD into regular ref_listKarthik Nayak2015-09-231-28/+33
| * | | | | | | | | | | branch: bump get_head_description() to the topKarthik Nayak2015-09-231-31/+31
| * | | | | | | | | | | branch: refactor width computationKarthik Nayak2015-09-231-30/+34
* | | | | | | | | | | | Merge branch 'sb/perf-without-installed-git'Junio C Hamano2015-10-151-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t/perf: make runner work even if Git is not installedsb/perf-without-installed-gitStephan Beyer2015-09-251-0/+1
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'sb/http-flaky-test-fix'Junio C Hamano2015-10-153-23/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t5561: get rid of racy appending to logfilesb/http-flaky-test-fixStephan Beyer2015-09-253-23/+1
* | | | | | | | | | | | | Merge branch 'jc/fsck-dropped-errors'Junio C Hamano2015-10-152-5/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \