summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | Merge branch 'maint-1.7.7' into maintJunio C Hamano2012-01-112-1/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | / / / / / | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2012-01-112-1/+2
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | attr: fix leak in free_attr_elemJeff King2012-01-111-0/+1
| | | * | | | | | t2203: fix wrong commit commandNguyễn Thái Ngọc Duy2012-01-111-1/+1
* | | | | | | | | Merge branch 'bw/maint-t8006-sed-incomplete-line'Junio C Hamano2012-01-101-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use perl instead of sed for t8006-blame-textconv testbw/maint-t8006-sed-incomplete-lineBen Walton2012-01-091-1/+1
* | | | | | | | | | Sync with maintJunio C Hamano2012-01-106-33/+91
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Prepare for 1.7.8.4Junio C Hamano2012-01-102-1/+15
| * | | | | | | | | Merge the attributes fix in from maint-1.6.7 branchJunio C Hamano2012-01-105-33/+77
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Prepare for 1.7.7.6Junio C Hamano2012-01-102-1/+12
| | * | | | | | | | Merge the attributes fix in from maint-1.6.6 branchJunio C Hamano2012-01-104-33/+66
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | Prepare for 1.7.6.6Junio C Hamano2012-01-102-1/+12
| | | * | | | | | | Documentation: rerere's rr-cache auto-creation and rerere.enabledJunio C Hamano2012-01-101-1/+2
| | | * | | | | | | attr.c: clarify the logic to pop attr_stackJunio C Hamano2012-01-101-1/+10
| | | * | | | | | | attr.c: make bootstrap_attr_stack() leave earlyJunio C Hamano2012-01-101-30/+31
| | | * | | | | | | attr: drop misguided defensive codingJeff King2012-01-101-1/+1
| | | * | | | | | | attr: don't confuse prefixes with leading directoriesJeff King2012-01-102-1/+12
* | | | | | | | | | Merge branch 'jk/credentials'Junio C Hamano2012-01-091-4/+3
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | credentials: unable to connect to cache daemonClemens Buchacher2012-01-081-4/+3
* | | | | | | | | | Merge branch 'mh/ref-api-less-extra-refs'Junio C Hamano2012-01-091-29/+22
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | write_head_info(): handle "extra refs" locallymh/ref-api-less-extra-refsMichael Haggerty2012-01-061-4/+3
| * | | | | | | | | | show_ref(): remove unused "flag" and "cb_data" argumentsMichael Haggerty2012-01-061-5/+5
| * | | | | | | | | | receive-pack: move more work into write_head_info()Michael Haggerty2012-01-061-24/+18
* | | | | | | | | | | Merge branch 'mm/maint-gitweb-project-maxdepth'Junio C Hamano2012-01-091-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | gitweb: accept trailing "/" in $project_listmm/maint-gitweb-project-maxdepthMatthieu Moy2012-01-041-2/+2
* | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2012-01-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | send-email: multiedit is a boolean config optionJeff King2012-01-091-1/+1
* | | | | | | | | | | | Git 1.7.9-rc0v1.7.9-rc0Junio C Hamano2012-01-062-1/+8
* | | | | | | | | | | | Merge branch 'jc/show-sig'Junio C Hamano2012-01-0616-34/+488
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | log --show-signature: reword the common two-head merge casejc/show-sigJunio C Hamano2012-01-051-0/+12
| * | | | | | | | | | | | log-tree: show mergetag in log --show-signature outputJunio C Hamano2012-01-051-1/+75
| * | | | | | | | | | | | log-tree.c: small refactor in show_signature()Junio C Hamano2012-01-051-12/+16
| * | | | | | | | | | | | commit --amend -S: strip existing gpgsig headersJunio C Hamano2012-01-054-8/+36
| * | | | | | | | | | | | verify_signed_buffer: fix stale commentJunio C Hamano2012-01-051-4/+1
| * | | | | | | | | | | | Merge branch 'jc/signed-commit' and 'jc/pull-signed-tag'Junio C Hamano2012-01-0515-19/+364
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | gpg-interface: allow use of a custom GPG binaryjc/signed-commitJunio C Hamano2011-11-293-6/+24
| | * | | | | | | | | | | | pretty: %G[?GS] placeholdersJunio C Hamano2011-11-121-0/+86
| | * | | | | | | | | | | | test "commit -S" and "log --show-signature"Junio C Hamano2011-11-121-0/+71
| | * | | | | | | | | | | | log: --show-signatureJunio C Hamano2011-11-125-0/+88
| | * | | | | | | | | | | | commit: teach --gpg-sign optionJunio C Hamano2011-11-127-13/+95
* | | | | | | | | | | | | | Merge branch 'jm/stash-diff-disambiguate'Junio C Hamano2012-01-064-31/+80
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | stash: Don't fail if work dir contains file named 'HEAD'jm/stash-diff-disambiguateJonathon Mah2012-01-014-31/+80
* | | | | | | | | | | | | | | Merge branch 'jh/fetch-head-update'Junio C Hamano2012-01-0625-102/+114
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | write first for-merge ref to FETCH_HEAD firstjh/fetch-head-updateJoey Hess2012-01-0325-102/+114
* | | | | | | | | | | | | | | | Merge branch 'pw/p4-view-updates'Junio C Hamano2012-01-063-82/+564
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | git-p4: view spec documentationPete Wyckoff2012-01-031-13/+27
| * | | | | | | | | | | | | | | | git-p4: rewrite view handlingPete Wyckoff2012-01-032-101/+258
| * | | | | | | | | | | | | | | | git-p4: support single file p4 client view mapsGary Gibbons2012-01-032-10/+21
| * | | | | | | | | | | | | | | | git-p4: sort client views by reverse View numberGary Gibbons2012-01-032-3/+10
| * | | | | | | | | | | | | | | | git-p4: fix test for unsupported P4 Client ViewsGary Gibbons2012-01-032-3/+6
View Lorry Controller Status