turnip

~pappacena/turnip:fix-diff-delete-conflict

  1. Git
  2. lp:~pappacena/turnip
  3. fix-diff-delete-conflict
Last commit made on 2020-02-20
Get this branch:
git clone -b fix-diff-delete-conflict https://git.launchpad.net/~pappacena/turnip
Only Thiago F. Pappacena can upload to this branch. If you are Thiago F. Pappacena please log in for upload directions.

Branch merges

Branch information

Name:
fix-diff-delete-conflict
Repository:
lp:~pappacena/turnip

Recent commits

aafcec6... by Thiago F. Pappacena

do not try to remove delete/delete conflicts from index

92a1485... by Thiago F. Pappacena

On tests, when we ask to clone a repo we will edit it as a user would. Lets not use bare=True

29e0a5a... by Thiago F. Pappacena

ignoring index removal exception when the conflicting file was renamed

91600e8... by Kristian Glass

Rename README to README.rst to reflect the syntax used within

Merged from https://code.launchpad.net/~doismellburning/turnip/+git/turnip/+merge/378313

aa6790e... by Kristian Glass

Rename README to README.rst to reflect the syntax used within

ecf31cf... by Kristian Glass

Use the long form of pip's `quiet` argument for clarity

Merged from https://code.launchpad.net/~doismellburning/turnip/+git/turnip/+merge/378321

1f4d8ed... by Kristian Glass

Use the long form of pip's `quiet` argument for clarity

af15e5d... by Kristian Glass

Rename PIP_CACHE_ARGS to PIP_ARGS

PIP_CACHE_ARGS isn't just used for interacting with the pip cache,
it's currently used for all arguments including being the control
interface for pip verbosity.

Renaming it to PIP_ARGS reflects its general nature and broad usage.

Merged from https://code.launchpad.net/~doismellburning/turnip/+git/turnip/+merge/378318

3f1d908... by Kristian Glass

Rename PIP_CACHE_ARGS to PIP_ARGS

PIP_CACHE_ARGS isn't just used for interacting with the pip cache,
it's currently used for all arguments including being the control
interface for pip verbosity.

Renaming it to PIP_ARGS reflects its general nature and broad usage.

26c2a77... by Ioana Lasc

Update doc on running Turnip alongside local LP

Merged from https://code.launchpad.net/~ilasc/turnip/+git/turnip/+merge/376986