aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| | * | | | | | | | | | | | | | | | Merge the attributes fix in from maint-1.6.6 branchJunio C Hamano2012-01-10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Prepare for 1.7.6.6Junio C Hamano2012-01-10
| | | * | | | | | | | | | | | | | | Documentation: rerere's rr-cache auto-creation and rerere.enabledJunio C Hamano2012-01-10
| | | * | | | | | | | | | | | | | | attr.c: clarify the logic to pop attr_stackJunio C Hamano2012-01-10
| | | * | | | | | | | | | | | | | | attr.c: make bootstrap_attr_stack() leave earlyJunio C Hamano2012-01-10
| | | * | | | | | | | | | | | | | | attr: drop misguided defensive codingJeff King2012-01-10
| | | * | | | | | | | | | | | | | | attr: don't confuse prefixes with leading directoriesJeff King2012-01-10
* | | | | | | | | | | | | | | | | | Merge branch 'jk/credentials'Junio C Hamano2012-01-09
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | credentials: unable to connect to cache daemonClemens Buchacher2012-01-08
* | | | | | | | | | | | | | | | | | Merge branch 'mh/ref-api-less-extra-refs'Junio C Hamano2012-01-09
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | write_head_info(): handle "extra refs" locallyMichael Haggerty2012-01-06
| * | | | | | | | | | | | | | | | | | show_ref(): remove unused "flag" and "cb_data" argumentsMichael Haggerty2012-01-06
| * | | | | | | | | | | | | | | | | | receive-pack: move more work into write_head_info()Michael Haggerty2012-01-06
* | | | | | | | | | | | | | | | | | | Merge branch 'mm/maint-gitweb-project-maxdepth'Junio C Hamano2012-01-09
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | gitweb: accept trailing "/" in $project_listMatthieu Moy2012-01-04
* | | | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2012-01-09
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | / / / / / / / / | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | send-email: multiedit is a boolean config optionJeff King2012-01-09
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Git 1.7.9-rc0v1.7.9-rc0Junio C Hamano2012-01-06
* | | | | | | | | | | | | | | | | | Merge branch 'jc/show-sig'Junio C Hamano2012-01-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | log --show-signature: reword the common two-head merge caseJunio C Hamano2012-01-05
| * | | | | | | | | | | | | | | | | | log-tree: show mergetag in log --show-signature outputJunio C Hamano2012-01-05
| * | | | | | | | | | | | | | | | | | log-tree.c: small refactor in show_signature()Junio C Hamano2012-01-05
| * | | | | | | | | | | | | | | | | | commit --amend -S: strip existing gpgsig headersJunio C Hamano2012-01-05
| * | | | | | | | | | | | | | | | | | verify_signed_buffer: fix stale commentJunio C Hamano2012-01-05
| * | | | | | | | | | | | | | | | | | Merge branch 'jc/signed-commit' and 'jc/pull-signed-tag'Junio C Hamano2012-01-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | gpg-interface: allow use of a custom GPG binaryJunio C Hamano2011-11-29
| | * | | | | | | | | | | | | | | | | | pretty: %G[?GS] placeholdersJunio C Hamano2011-11-12
| | * | | | | | | | | | | | | | | | | | test "commit -S" and "log --show-signature"Junio C Hamano2011-11-12
| | * | | | | | | | | | | | | | | | | | log: --show-signatureJunio C Hamano2011-11-12
| | * | | | | | | | | | | | | | | | | | commit: teach --gpg-sign optionJunio C Hamano2011-11-12
* | | | | | | | | | | | | | | | | | | | Merge branch 'jm/stash-diff-disambiguate'Junio C Hamano2012-01-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | stash: Don't fail if work dir contains file named 'HEAD'Jonathon Mah2012-01-01
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jh/fetch-head-update'Junio C Hamano2012-01-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | write first for-merge ref to FETCH_HEAD firstJoey Hess2012-01-03
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'pw/p4-view-updates'Junio C Hamano2012-01-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | git-p4: view spec documentationPete Wyckoff2012-01-03
| * | | | | | | | | | | | | | | | | | | | | git-p4: rewrite view handlingPete Wyckoff2012-01-03
| * | | | | | | | | | | | | | | | | | | | | git-p4: support single file p4 client view mapsGary Gibbons2012-01-03
| * | | | | | | | | | | | | | | | | | | | | git-p4: sort client views by reverse View numberGary Gibbons2012-01-03
| * | | | | | | | | | | | | | | | | | | | | git-p4: fix test for unsupported P4 Client ViewsGary Gibbons2012-01-03
| * | | | | | | | | | | | | | | | | | | | | git-p4: test client view handlingPete Wyckoff2012-01-03
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Sync with 1.7.8.3Junio C Hamano2012-01-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Git 1.7.8.3v1.7.8.3Junio C Hamano2012-01-06
| * | | | | | | | | | | | | | | | | | | Merge branch 'jn/maint-gitweb-utf8-fix' into maintJunio C Hamano2012-01-06
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.7.7' into maintJunio C Hamano2012-01-06
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | / / / / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2012-01-06
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Documentation: rerere.enabled is the primary way to configure rerereThomas Rast2012-01-06
* | | | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2012-01-04
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | / / / / / / / / / / / / / / / | |_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | t5550: repack everything into one fileClemens Buchacher2012-01-04
| * | | | | | | | | | | | | | | | | | Merge branch 'nd/maint-parse-depth' into maintJunio C Hamano2012-01-04
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \