Code Monkey home page Code Monkey logo

Comments (6)

abiosoft avatar abiosoft commented on September 27, 2024 1

I don't wanna introduce a breaking change, would've just changed to more specific clone_args and pull_args while removing args.

from caddy-git.

abiosoft avatar abiosoft commented on September 27, 2024 1

It has been implemented and should show up in Caddy soon.

from caddy-git.

abiosoft avatar abiosoft commented on September 27, 2024

Good point you've raised there, though the document indicates the args are for clone.

How does changing pull to fetch and checkout help your scenario ?

from caddy-git.

OJFord avatar OJFord commented on September 27, 2024

Yes, the documentation's good @abiosoft, sorry I should have been more clear, but I meant when reading code it's not clear unless familiar with the particular argument used.

pull attempts a merge in the presence of local changes; if it instead fetched (without moving HEAD) and then checkouted the remote copy, local changes would be lost in favour of remote, just as with pull -X theirs.

My goal is just to ignore anything I've done tinkering around on the server, or that's been overwritten by something (presumably accidentally) and replace it with the latest revision under version control.

from caddy-git.

asdofindia avatar asdofindia commented on September 27, 2024

I wanted to --allow-unrelated-histories so that my static site which's generated and (force)-pushed to a branch works. But, of course, the arg goes to clone and not to pull

from caddy-git.

OJFord avatar OJFord commented on September 27, 2024

That sounds good; potentially solves some problems people might have the other way around too.

from caddy-git.

Related Issues (20)

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.