git.proxmox.com Git - libgit2.git/commit

]> git.proxmox.com Git - libgit2.git/commit

author	Edward Thomson <ethomson@microsoft.com>
	Mon, 20 Jan 2014 22:13:55 +0000 (17:13 -0500)
committer	Edward Thomson <ethomson@microsoft.com>
	Mon, 20 Jan 2014 23:07:17 +0000 (18:07 -0500)
commit	0ef19fe14ce5a5f7b5ac90966a56997bf04ea5a9
tree	e55254b0dc5473e95227a189d8b37d1450a7c26a	tree
parent	db3462ce7714e2a6ce23130a7046a77860739e05	commit \| diff

Merge submodules

48 files changed:

src/checkout.c		diff \| blob \| blame \| history
src/merge.c		diff \| blob \| blame \| history
tests/merge/workdir/submodules.c	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/config		diff \| blob \| blame \| history
tests/resources/merge-resolve/.gitted/modules/submodule/HEAD	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/modules/submodule/ORIG_HEAD	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/modules/submodule/config	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/modules/submodule/index	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/modules/submodule/info/exclude	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/modules/submodule/objects/18/fae1354bba0a5f1e6a531f9988369142c24a9e	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/modules/submodule/objects/29/7aa6cd028b3336c7802c7a6f49143da4e1602d	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/modules/submodule/objects/38/6c80dc813b89d719797668f40c1be0a6efa996	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/modules/submodule/objects/ab/435a147bae6d5906ecfd0916a570c4ab3eeea8	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/modules/submodule/objects/ad/16e0a7684ea95bf892980a2ee412293ae979cc	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/modules/submodule/objects/ae/39c77c70cb6bad18bb471912460c4e1ba0f586	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/modules/submodule/objects/c2/0765f6e24e8bbb63a648d0d11d84da63170190	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/modules/submodule/objects/d3/d806a4bef96889117fd7ebac0e3cb5ec152932	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/modules/submodule/objects/f1/065ff5593604072837fecaad3e2e268cb0147b	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/modules/submodule/packed-refs	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/modules/submodule/refs/heads/master	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/modules/submodule/refs/remotes/origin/HEAD	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/objects/0f/3fc5dddc8964b9ac1040d0e957f9eb02d9efb3	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/objects/27/4bbe983022fb4c02f8a2bf2ebe8da4fe130054	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/objects/2b/fdd7e1b6c6ae993f23dfe8e84a8e06a772fa2a	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/objects/42/18670ab81cc219a9f94befb5c5dad90ec52648	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/objects/49/fd9edac79d15c8fbfca2d481cbb900beba22a6	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/objects/58/87a5e516c53bd58efb0f02ec6aa031b6fe9ad7	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/objects/60/61fe116ecba0800c26113ea1a7dfac2e16eeaf	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/objects/62/33c6a0670228627f93c01cef32485a30403670	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/objects/67/110d77886b2af6309b9212961e72b8583e5fa9	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/objects/72/cdb057b340205164478565e91eb71647e66891	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/objects/7a/f14d9c679baaef35555095f4f5d33e9a569ab9	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/objects/7c/04ca611203ed320c5f495b9813054dd23be3be	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/objects/81/1c70fcb6d5bbd022d04cc31836d30b436f9551	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/objects/8b/7cd60d49ce3a1a770ece43b7d29b5cf462a33a	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/objects/91/f44111cb1cb1358ac6944ad356ca1738813ea1	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/objects/96/bca8d4f05cc4c5e33e4389f80a1309e86fe054	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/objects/ad/26b598134264fd284292cb233fc0b2f25851da	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/objects/ca/ff6b7d44973f53e3e0cf31d0d695188b19aec6	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/objects/d3/3cedf513c059e0515653fa2c2e386631387a05	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/objects/d8/dec75ff2f8b41d1c5bfef0cd57b7300c834f66	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/objects/dd/2ae5ab264e5592aa754235d5ad5eac8f0ecdfd	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/objects/e5/060729746ca9888239cba08fdcf4bee907b406	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/objects/f2/e1550a0c9e53d5811175864a29536642ae3821	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/objects/f6/65b45cde9b568009c6e6b7b568e89cfe717df8	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/refs/heads/submodules	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/refs/heads/submodules-branch	[new file with mode: 0644]	blob
tests/resources/merge-resolve/.gitted/refs/heads/submodules-branch2	[new file with mode: 0644]	blob

The git library used in some Proxmox tool chains

RSS Atom