d20ac24c2fe860dba99b40d76fe371a323e9918d Avery Pennarun apenwarr@gmail.com http://github.com/apenwarr/git-subtree/commit/d344532afd3d99c9cdd6d7cfc46bd92ff7def4e8 d344532afd3d99c9cdd6d7cfc46bd92ff7def4e8

2009-11-20T16:43:47-08:00

Weird, I forgot to have 'make test' call test.sh. 97c1e65e3c882fa9951f7dfc43b294e070e29717 Avery Pennarun apenwarr@gmail.com 0d31de303f9e8e28cc1649dbf41c1cc635bae2d8 Ben Walton bwalton@artsci.utoronto.ca http://github.com/apenwarr/git-subtree/commit/d20ac24c2fe860dba99b40d76fe371a323e9918d d20ac24c2fe860dba99b40d76fe371a323e9918d

2009-11-15T09:18:15-08:00

2009-11-13T17:29:40-08:00

make git version dynamic when building documentation Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca> 4b86ee6e9cf80054cd50ebbe95295be7cbacb14c Avery Pennarun apenwarr@gmail.com d8b2c0da177ddfc2bc8d1e47278aa1c240d63034 Ben Walton bwalton@artsci.utoronto.ca http://github.com/apenwarr/git-subtree/commit/0d31de303f9e8e28cc1649dbf41c1cc635bae2d8 0d31de303f9e8e28cc1649dbf41c1cc635bae2d8

2009-11-15T09:18:13-08:00

2009-11-13T17:29:39-08:00

add installation support to Makefile Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca> 0a908421c6f74b5ea5d0d7fc4c5428aeea88d5c7 Avery Pennarun apenwarr@gmail.com c567d9e59fceb93d7334a1414d0a2a9d6f4913de Avery Pennarun apenwarr@gmail.com http://github.com/apenwarr/git-subtree/commit/d8b2c0da177ddfc2bc8d1e47278aa1c240d63034 d8b2c0da177ddfc2bc8d1e47278aa1c240d63034

2009-11-15T09:13:19-08:00

2009-11-15T09:13:08-08:00

Oops, forgot a COPYING file. It's GPLv2. Thanks to Ben Walton for pointing this out. 6b0728708e0b3b1bdb78461619290c27653603d5 Avery Pennarun apenwarr@gmail.com e31d1e2f30c943473de7a23bbbcd2dcea698e312 Avery Pennarun apenwarr@gmail.com http://github.com/apenwarr/git-subtree/commit/c567d9e59fceb93d7334a1414d0a2a9d6f4913de c567d9e59fceb93d7334a1414d0a2a9d6f4913de

2009-11-04T11:50:33-08:00

Add some tips for how to install. 9eb9c3c08229c00b06af87f765bba76f5aa09af3 Avery Pennarun apenwarr@gmail.com 2275f7077d5ea2bb9201599dec0dd8f2a5de2e40 Avery Pennarun apenwarr@gmail.com http://github.com/apenwarr/git-subtree/commit/e31d1e2f30c943473de7a23bbbcd2dcea698e312 e31d1e2f30c943473de7a23bbbcd2dcea698e312

2009-10-02T15:23:54-07:00

cmd_pull didn't support --squash correctly. We should implement it as git fetch ... git subtree merge ... But we were instead just calling git pull -s subtree ... because 'git subtree merge' used to be just an alias for 'git merge -s subtree', but it no longer is. 79d120ed537bcda8a151721d6503baf4c8c79c12 Avery Pennarun apenwarr@gmail.com 6f2012cdc021f6b47ed19bc7fe64159ce9eeda8a Avery Pennarun apenwarr@gmail.com http://github.com/apenwarr/git-subtree/commit/2275f7077d5ea2bb9201599dec0dd8f2a5de2e40 2275f7077d5ea2bb9201599dec0dd8f2a5de2e40

2009-10-02T13:09:48-07:00

2009-10-02T13:09:09-07:00

Fix a minor problem in identifying squashes vs. normal splits. This didn't seem to have any noticeable side effects other than suspicious-looking log messages when you used -d. bd361ddbb36b7334c6a95d520937e0986ee05203 Avery Pennarun apenwarr@gmail.com 39ee6ecf7ed8b3c6a5c8ed24f825211f3b920f76 Avery Pennarun apenwarr@gmail.com http://github.com/apenwarr/git-subtree/commit/6f2012cdc021f6b47ed19bc7fe64159ce9eeda8a 6f2012cdc021f6b47ed19bc7fe64159ce9eeda8a

2009-10-02T13:08:58-07:00

2009-10-02T12:22:15-07:00

If someone provides a --prefix that ends with slash, strip the slash. Prefixes that differ only in the trailing slash should be considered identical. Also update the test to check that this works. 1c3fdb6d87802b71bb23d7a4786aee8252e0faea Avery Pennarun apenwarr@gmail.com add00a3229ba4ada0cb47a447fdc483658df78e9 8ac5eca1eaa88bd5b998e91531937404bc6425c4 Avery Pennarun apenwarr@gmail.com http://github.com/apenwarr/git-subtree/commit/39ee6ecf7ed8b3c6a5c8ed24f825211f3b920f76 39ee6ecf7ed8b3c6a5c8ed24f825211f3b920f76

2009-10-02T11:53:35-07:00

Merge branch 'master' of git://github.com/voxpelli/git-subtree * 'master' of git://github.com/voxpelli/git-subtree: Check that the type of the tree really is a tree and not a commit as it seems to sometimes become when eg. a submodule has existed in the same position previously. 369a4e5598d8909038018523574ccd6f42dded46 Avery Pennarun apenwarr@gmail.com 227f78114752eee2e8ae3368089716d73d32dd8b Avery Pennarun apenwarr@gmail.com http://github.com/apenwarr/git-subtree/commit/add00a3229ba4ada0cb47a447fdc483658df78e9 add00a3229ba4ada0cb47a447fdc483658df78e9

2009-10-02T08:51:25-07:00

Add a README that says to email me instead of using github mail. What's with this new generation who hates email so much? 3c1ce86ad2f4912733b5a974ced99cfe16426439 Avery Pennarun apenwarr@gmail.com 227f78114752eee2e8ae3368089716d73d32dd8b Pelle Wessman pelle@kodfabrik.se http://github.com/apenwarr/git-subtree/commit/8ac5eca1eaa88bd5b998e91531937404bc6425c4 8ac5eca1eaa88bd5b998e91531937404bc6425c4

2009-09-30T05:29:42-07:00

Check that the type of the tree really is a tree and not a commit as it seems to sometimes become when eg. a submodule has existed in the same position previously. 6015bf9cfbc0fbfe3fdb8f28556328acbbdd6383 Pelle Wessman pelle@kodfabrik.se 33aaa697a2386a02002f9fb8439d11243f12e1c7 Avery Pennarun apenwarr@gmail.com http://github.com/apenwarr/git-subtree/commit/227f78114752eee2e8ae3368089716d73d32dd8b 227f78114752eee2e8ae3368089716d73d32dd8b

2009-08-26T07:45:13-07:00

2009-08-26T07:43:43-07:00

Fix behaviour if you have a branch named the same as your --prefix We were trying to 'git checkout $prefix', which is ambiguous if $prefix names a directory *and* a branch. Do 'git checkout -- $prefix' instead. The main place this appeared was in 'git subtree add'. Reported by several people. 7a0c0f254453c72bc08e1074be0dae8aac20a2e4 Avery Pennarun apenwarr@gmail.com 2987e6add32f3367be8cc196ecac9195a213e415 Avery Pennarun apenwarr@gmail.com http://github.com/apenwarr/git-subtree/commit/33aaa697a2386a02002f9fb8439d11243f12e1c7 33aaa697a2386a02002f9fb8439d11243f12e1c7

2009-08-26T07:42:27-07:00

2009-08-26T07:41:03-07:00

Improve patch to use git --exec-path: add to PATH instead. If you (like me) are using a modified git straight out of its source directory (ie. without installing), then --exec-path isn't actually correct. Add it to the PATH instead, so if it is correct, it'll work, but if it's not, we fall back to the previous behaviour. 5b5d8e60fe23ce070832c07429f9abdedc015824 Avery Pennarun apenwarr@gmail.com 558e7a57e20fe68aee05f74f8005b7a39795ac15 kTln2 gianluca.pacchiella@ktln2.org http://github.com/apenwarr/git-subtree/commit/2987e6add32f3367be8cc196ecac9195a213e415 2987e6add32f3367be8cc196ecac9195a213e415

2009-08-20T10:25:29-07:00

2009-08-20T04:30:45-07:00

Add explicit path of git installation by 'git --exec-path'. As pointed out by documentation, the correct use of 'git-sh-setup' is using $(git --exec-path) to avoid problems with not standard installations. Signed-off-by: gianluca.pacchiella <pacchiel@studenti.ph.unito.it> 261030800df71800e00f90f88cf9170483166a6a Avery Pennarun apenwarr@gmail.com e1a5b9d3e708d6be1a4c5220dc492da9f2694411 Amiel Martin amiel.martin@gmail.com http://github.com/apenwarr/git-subtree/commit/558e7a57e20fe68aee05f74f8005b7a39795ac15 558e7a57e20fe68aee05f74f8005b7a39795ac15

2009-08-12T15:38:00-07:00

sort assertion to make it more generic f49c14463d2647e20f40911e6beb56313b5038ce Amiel Martin amiel.martin@gmail.com ef7596677c181c649436fe97356dd31c1cb4a13e Amiel Martin amiel.martin@gmail.com http://github.com/apenwarr/git-subtree/commit/e1a5b9d3e708d6be1a4c5220dc492da9f2694411 e1a5b9d3e708d6be1a4c5220dc492da9f2694411

2009-08-12T15:25:18-07:00

2009-08-12T15:24:50-07:00

fixed order of assertion in tests e329e5ad0008c9a6a44a9debeaa2b732b4034f2e Amiel Martin amiel.martin@gmail.com 0af6aa46751aa6c1ec393155b938601ce0b5f7ae Avery Pennarun apenwarr@gmail.com http://github.com/apenwarr/git-subtree/commit/ef7596677c181c649436fe97356dd31c1cb4a13e ef7596677c181c649436fe97356dd31c1cb4a13e

2009-08-02T14:48:41-07:00

2009-08-02T14:48:20-07:00

todo: idea for a 'git subtree grafts' command 34f6beb264edc97a5df1086acee9c9b3947287a4 Avery Pennarun apenwarr@gmail.com 344f58abe599cba53a056c0a707c9a99e2cd13a8 Avery Pennarun apenwarr@gmail.com http://github.com/apenwarr/git-subtree/commit/0af6aa46751aa6c1ec393155b938601ce0b5f7ae 0af6aa46751aa6c1ec393155b938601ce0b5f7ae

2009-07-31T22:19:48-07:00

todo 5f92afaf616a7dcf3c36b4e7754c4434d2399e78 Avery Pennarun apenwarr@gmail.com 5d1a5da411a8ec90cd7a7819bfc74440e3f2545c Avery Pennarun apenwarr@gmail.com http://github.com/apenwarr/git-subtree/commit/344f58abe599cba53a056c0a707c9a99e2cd13a8 344f58abe599cba53a056c0a707c9a99e2cd13a8

2009-07-16T11:31:50-07:00

todo^ c818d4e679294cb7912c686edae74d26facc3911 Avery Pennarun apenwarr@gmail.com b64a7aa26c72fcae7b6e1decd88ed706c185cda7 Avery Pennarun apenwarr@gmail.com http://github.com/apenwarr/git-subtree/commit/5d1a5da411a8ec90cd7a7819bfc74440e3f2545c 5d1a5da411a8ec90cd7a7819bfc74440e3f2545c

2009-07-10T12:14:33-07:00

todo 07c27117ceac36665c557121ebd39dabcead8d14 Avery Pennarun apenwarr@gmail.com 76a7356f56655dbcbbc9d472e0cdc85c6ed3759f Avery Pennarun apenwarr@gmail.com http://github.com/apenwarr/git-subtree/commit/b64a7aa26c72fcae7b6e1decd88ed706c185cda7 b64a7aa26c72fcae7b6e1decd88ed706c185cda7

2009-07-08T17:17:31-07:00

Docs: when pushing to github, the repo path needs to end in .git Reported by Thell Fowler. 96bb2a4df3a9ef4a584cce0e7402f55fd9f446b4 Avery Pennarun apenwarr@gmail.com 6aa76263eed68ffed7405687f407e66deec30b02 Avery Pennarun apenwarr@gmail.com http://github.com/apenwarr/git-subtree/commit/76a7356f56655dbcbbc9d472e0cdc85c6ed3759f 76a7356f56655dbcbbc9d472e0cdc85c6ed3759f

2009-07-07T14:41:38-07:00

todo e688a483427ad3ec46fd6a6647ab3e4afb06935b Avery Pennarun apenwarr@gmail.com c8a98d4f8730d85a6f693d5dbcd4c1309d97f7c8 Avery Pennarun apenwarr@gmail.com http://github.com/apenwarr/git-subtree/commit/6aa76263eed68ffed7405687f407e66deec30b02 6aa76263eed68ffed7405687f407e66deec30b02

2009-07-02T09:39:48-07:00

Some todo items reported by pmccurdy 959e4eb4678f1220a6ce41e993744a8ed4088884 Avery Pennarun apenwarr@gmail.com dd07906252a3983fdec396ea6c58de12548713e1 Avery Pennarun apenwarr@gmail.com http://github.com/apenwarr/git-subtree/commit/c8a98d4f8730d85a6f693d5dbcd4c1309d97f7c8 c8a98d4f8730d85a6f693d5dbcd4c1309d97f7c8

2009-06-15T11:12:40-07:00

update todo 1c3e76081fc2de005acabf0ac258078fed73222b Avery Pennarun apenwarr@gmail.com e75d1da38a7091c15ebd3c80539e4aab20faf5b7 Avery Pennarun apenwarr@gmail.com http://github.com/apenwarr/git-subtree/commit/dd07906252a3983fdec396ea6c58de12548713e1 dd07906252a3983fdec396ea6c58de12548713e1

2009-05-30T11:24:31-07:00

man page: add an EXAMPLES section. d8bdbc796b56a83ebd0e8fe3854e371eabd23cd0 Avery Pennarun apenwarr@gmail.com d713e2d87a5003da02d95a4ac5be28a1e9fdc3ce Avery Pennarun apenwarr@gmail.com http://github.com/apenwarr/git-subtree/commit/e75d1da38a7091c15ebd3c80539e4aab20faf5b7 e75d1da38a7091c15ebd3c80539e4aab20faf5b7

2009-05-30T11:06:58-07:00

2009-05-30T11:05:33-07:00

Add basic git-subtree manpage in asciidoc format. 17e7110445a8d6710c69d8f20738b5fc69d4ae65 Avery Pennarun apenwarr@gmail.com 1a8c36dc5fdd8c439c65f18a91ad211050201fc8 Avery Pennarun apenwarr@gmail.com http://github.com/apenwarr/git-subtree/commit/d713e2d87a5003da02d95a4ac5be28a1e9fdc3ce d713e2d87a5003da02d95a4ac5be28a1e9fdc3ce

2009-05-30T01:13:47-07:00

2009-05-30T01:11:43-07:00

Make --squash work with the 'add' command too. a9caf26434e1678728ee64a61641c22c09221902 Avery Pennarun apenwarr@gmail.com eb4fb91094cf5e20bf7570da3fadb50e444284bc Avery Pennarun apenwarr@gmail.com http://github.com/apenwarr/git-subtree/commit/1a8c36dc5fdd8c439c65f18a91ad211050201fc8 1a8c36dc5fdd8c439c65f18a91ad211050201fc8

2009-05-30T00:33:39-07:00

Fix splitting after using a squash merge. 6d900dae51689fa4f5c654fd6ebcd161cda0feb2 Avery Pennarun apenwarr@gmail.com 1cc2cfff91c61bb56236914da7be7b15584951df Avery Pennarun apenwarr@gmail.com http://github.com/apenwarr/git-subtree/commit/eb4fb91094cf5e20bf7570da3fadb50e444284bc eb4fb91094cf5e20bf7570da3fadb50e444284bc

2009-05-30T00:33:17-07:00

Don't squash-merge if the old and new commits are the same. fd3e963ddb9dd887c498696919e97c47e072714b Avery Pennarun apenwarr@gmail.com 7ee9eef340170da6d13b9a0ab5a8d23950523b0d Avery Pennarun apenwarr@gmail.com http://github.com/apenwarr/git-subtree/commit/1cc2cfff91c61bb56236914da7be7b15584951df 1cc2cfff91c61bb56236914da7be7b15584951df

2009-05-30T00:18:27-07:00

Basic "subtree merge --squash" support. Instead of merging in the history of the entire subproject, just squash it all into one commit, but try to at least track which commits we used so that we can do future merges correctly. Bonus feature: we can actually switch branches of the subproject this way, just by "squash merging" back and forth from one tag to another. 77ecfefdbc8a8d95f3bbff44559fb1a23b8d5041 Avery Pennarun apenwarr@gmail.com