?
?
LiveJournal
  • Find more
    • Your 2020 in LJ
    • Communities
    • RSS Reader
  • Shop
  • Help
  • Login
  • Join free Join
  • English (en)
    • English (en)
    • Русский (ru)
    • Українська (uk)
    • Français (fr)
    • Português (pt)
    • español (es)
    • Deutsch (de)
    • Italiano (it)
    • Беларуская (be)
alfedenzo —
Subscribe
LiveJournal

Log in

No account? Create an account
Forgot password
Facebook Twitter Google RAMBLER&Co ID

By logging in to LiveJournal using a third-party service you accept LiveJournal's User agreement

No account? Create an account

Alfedenzo

  • Recent Entries
  • Friends
  • Profile
  • Archive
  • Tags
  • Categories
  • Memories
  • Alfedenzia
← →
10th
  • 08:26 pm Thoughts on the Library of Babel - 2 comments
Collapse

Calendar

Dec 2008
S M T W T F S
  1 2 3 4 5 6
7 8 9 10 11 12 13
14 15 16 17 18 19 20
21 22 23 24 25 26 27
28 29 30 31      

Tags

  • books
  • computers
  • food
  • math
  • university
  • wii
  • work
  • zelda

Comments

  • johnmicelli
    12 Oct 2017, 13:44
    (no subject)
    I have write a good article about how can you stop someone snoring, take a look at my profile
  • roryokane
    11 Mar 2015, 06:11
    Patience Diff, a brief summary
    I generated a standard diff and the patience diff for the example in this article. LiveJournal totally messed up the formatting, so it’s in the GitHub Gist with ID 6f9061d3a60c1ba41237 (gist dot…
  • vicokep
    17 Feb 2013, 07:58
    (no subject)
    Hey Stranger! This is Liza. CALL ME! Go Here dld.bz/chwZN
  • ironcream
    16 Aug 2011, 17:38
    Patience Diff, a brief summary
    Thanks for the explanation!
  • M. Emin Akşehirli
    22 Jun 2011, 09:02
    Patience Diff, a brief summary
    Yes it is.

    git diff --patience HEAD HEAD^
    diff --git a/a.txt b/a.txt
    index accc3bd..3299d68 100644
    --- a/a.txt
    +++ b/a.txt
    @@ -1,7 +1,7 @@
    +aaaaaa
    +aaaaaa
    +bbbbbb
    +bbbbbb
    +cccccc
    +cccccc
    abc…

Search