| commit | dc03b3817aa8e52fd7a2d37711ac220429e2b00c | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 13 Jul 2009 19:26:55 +0000 (13 12:26 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 13 Jul 2009 19:26:55 +0000 (13 12:26 -0700) | ||
| tree | aef176a1eb92e33f6230066395d8c61230ad0eac | treesnapshot (tar.gz zip) |
| parent | a6a21e81f03260aa5ff0e4e88917d92565f72add | commitdiff |
| parent | 4f67cc0d57d7e330e4db8ac054a39e76b8cb8ad1 | commitdiff |
Merge branch 'pb/tracking' into next
* pb/tracking:
branch, checkout: introduce autosetuppush
move deletion of merge configuration to branch.c
remote: add per-remote autosetupmerge and autosetuprebase configuration
introduce a struct tracking_config
branch: install_branch_config and struct tracking refactoring
config: allow false and true values for branch.autosetuprebase
* pb/tracking:
branch, checkout: introduce autosetuppush
move deletion of merge configuration to branch.c
remote: add per-remote autosetupmerge and autosetuprebase configuration
introduce a struct tracking_config
branch: install_branch_config and struct tracking refactoring
config: allow false and true values for branch.autosetuprebase
| cache.h | diff1 | diff2 | blobhistory |
| environment.c | diff1 | diff2 | blobhistory |