summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/upload-pack-keepalive'Junio C Hamano2013-09-202-1/+35
|\
| * upload-pack: bump keepalive default to 5 secondsjk/upload-pack-keepaliveJeff King2013-09-092-2/+2
| * upload-pack: send keepalive packets during pack computationJeff King2013-09-092-1/+35
* | Merge branch 'fc/at-head'Junio C Hamano2013-09-207-7/+54
|\ \
| * | Add new @ shortcut for HEADfc/at-headFelipe Contreras2013-09-125-0/+45
| * | sha1-name: pass len argument to interpret_branch_name()Felipe Contreras2013-09-034-7/+9
* | | Merge branch 'dw/check-ignore-sans-index'Junio C Hamano2013-09-203-11/+74
|\ \ \
| * | | check-ignore: Add option to ignore index contentsdw/check-ignore-sans-indexDave Williams2013-09-123-11/+74
* | | | Merge branch 'mm/commit-template-squelch-advice-messages'Junio C Hamano2013-09-203-27/+37
|\ \ \ \
| * | | | commit: disable status hints when writing to COMMIT_EDITMSGmm/commit-template-squelch-advice-messagesMatthieu Moy2013-09-121-0/+6
| * | | | wt-status: turn advice_status_hints into a field of wt_statusMatthieu Moy2013-09-123-19/+21
| * | | | commit: factor status configuration is a helper functionMatthieu Moy2013-09-121-8/+10
| | |/ / | |/| |
* | | | Merge branch 'bk/refs-multi-update'Junio C Hamano2013-09-2015-41/+1139
|\ \ \ \
| * | | | update-ref: add test cases covering --stdin signaturebk/refs-multi-updateBrad King2013-09-111-0/+632
| * | | | update-ref: support multiple simultaneous updatesBrad King2013-09-092-2/+304
| * | | | refs: add update_refs for multiple simultaneous updatesBrad King2013-09-042-0/+120
| * | | | refs: add function to repack without multiple refsBrad King2013-09-041-9/+24
| * | | | refs: factor delete_ref loose ref step into a helperBrad King2013-09-041-10/+17
| * | | | refs: factor update_ref steps into helpersBrad King2013-09-041-6/+24
| * | | | refs: report ref type from lock_any_ref_for_updateBrad King2013-08-3011-13/+17
| * | | | reset: rename update_refs to reset_refsBrad King2013-08-301-2/+2
| |/ / /
* | | | Merge branch 'nr/git-cd-to-a-directory'Junio C Hamano2013-09-203-2/+111
|\ \ \ \
| * | | | t0056: "git -C" test updatesnr/git-cd-to-a-directoryNazri Ramliy2013-09-191-6/+8
| * | | | git: run in a directory given with -C optionNazri Ramliy2013-09-093-2/+109
| |/ / /
* | | | Merge branch 'mm/rebase-continue-freebsd-WB'Junio C Hamano2013-09-201-1/+10
|\ \ \ \
| * | | | rebase: fix run_specific_rebase's use of "return" on FreeBSDmm/rebase-continue-freebsd-WBMatthieu Moy2013-09-091-1/+10
* | | | | Merge branch 'jh/checkout-auto-tracking'Junio C Hamano2013-09-204-8/+45
|\ \ \ \ \
| * | | | | t3200: fix failure on case-insensitive filesystemsjh/checkout-auto-trackingEric Sunshine2013-09-171-0/+1
| * | | | | branch.c: Relax unnecessary requirement on upstream's remote ref namePer Cederqvist2013-09-092-3/+2
| * | | | | t3200: Add test demonstrating minor regression in 41c21f2Johan Herland2013-09-091-0/+34
| * | | | | Refer to branch.<name>.remote/merge when documenting --trackJohan Herland2013-09-091-2/+4
| * | | | | t3200: Minor fix when preparing for tracking failureJohan Herland2013-09-091-1/+2
| * | | | | t2024: Fix &&-chaining and a couple of typosJohan Herland2013-09-091-3/+3
* | | | | | Merge branch 'bc/http-backend-allow-405'Junio C Hamano2013-09-201-2/+4
|\ \ \ \ \ \
| * | | | | | http-backend: provide Allow header for 405bc/http-backend-allow-405Brian M. Carlson2013-09-121-2/+4
* | | | | | | Merge branch 'np/lookup-object-hashing'Junio C Hamano2013-09-201-12/+10
|\ \ \ \ \ \ \
| * | | | | | | lookup_object: remove hashtable_index() and optimize hash_obj()np/lookup-object-hashingNicolas Pitre2013-09-111-12/+10
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'hu/cherry-pick-previous-branch'Junio C Hamano2013-09-202-0/+22
|\ \ \ \ \ \ \
| * | | | | | | cherry-pick: allow "-" as abbreviation of '@{-1}'Hiroshige Umino2013-09-092-0/+22
* | | | | | | | Merge branch 'mm/status-without-comment-char'Junio C Hamano2013-09-2011-852/+967
|\ \ \ \ \ \ \ \
| * | | | | | | | t7508: avoid non-portable sed expressionmm/status-without-comment-charEric Sunshine2013-09-171-1/+2
| * | | | | | | | status: add missing blank line after list of "other" filesMatthieu Moy2013-09-062-1/+24
| * | | | | | | | tests: don't set status.displayCommentPrefix file-wideMatthieu Moy2013-09-063-813/+793
| * | | | | | | | status: disable display of '#' comment prefix by defaultMatthieu Moy2013-09-068-17/+114
| * | | | | | | | submodule summary: ignore --for-status optionMatthieu Moy2013-09-063-20/+32
| * | | | | | | | wt-status: use argv_array APIMatthieu Moy2013-09-061-12/+14
| * | | | | | | | builtin/stripspace.c: fix broken indentationMatthieu Moy2013-09-061-4/+4
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'rh/peeling-tag-to-tag'Junio C Hamano2013-09-203-3/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | peel_onion: do not assume length of x_type globalsrh/peeling-tag-to-tagJeff King2013-09-031-4/+4
| * | | | | | | | peel_onion(): add support for <rev>^{tag}Richard Hansen2013-09-033-0/+12
| |/ / / / / / /