git diff/log and the order of start/end commits specified -


when running git log or git diff seems order of how commits specified important.

tip of branch is: 8ad4ff890446 , base of branch is: 6e91a6615

when run git log tip base get:

$ git log --oneline 8ad4ff890446..6e91a6615 d9b526fb ... a5f4ad92 ... af96bb6c ... 8d416ba9 ... c7a37d4f ...

if reverse arguments , run git log base tip get:

$ git log --oneline 6e91a6615..8ad4ff890446 2d6055e7 ... 656ac5b3 ... 3a4e2bbc ...

the last call expect - 3 commits introduced since base.

why 3 commits (correct) when going base -> tip compared 5 commits when going tip -> base?

the double dot syntax doesn't mean "going x y", means this:

the common range specification double-dot syntax. asks git resolve range of commits reachable 1 commit aren’t reachable another.

a simple example demonstrate output this:

                             master                                 v a---b---c---d---e---f---g---h---i              \               \-j---k---l                         ^                       branch

here master ahead of branch 5 commits , branch ahead of master 3 commits.

in case, command:

git log branch..master

should list 5 commits e-i, whereas this:

git log master..branch

should list 3 commits j-l.

if you're on windows can open command prompt , navigate temporary or new (empty) folder somewhere , paste these commands in, executing them:

git init %f in (a b c d e f g h i) (echo %f>test.txt && git add . && git commit -m "%f") git checkout head~5 -b branch %f in (j k l) (echo %f>test.txt && git add . && git commit -m "%f")

afterwards can execute these commands , inspect output

git log branch..master git log master..branch

Comments

Post a Comment

Popular posts from this blog

python - Operations inside variables -

this question has answer here: evaluating mathematical expression in string 12 answers i want make python script finds maximum possible output using 2 operations. problem says there syntax error @ 2nd last line, in b in there. how can fix it? x = 0 = int(input("1st number:")) c = int(input("2nd number:" )) e = int(input("3rd number:" )) in range(4): if == 0: b = "+" elif == 1: b = "-" elif == 2: b = "/" else: b = "*" j in range(4): if j == 0: d = "+" elif j == 1: d = "-" elif j == 2: d = "/" else: d = "*" k = b c d e print(k) if you're after variables e on single line, couldn...
Read more

Generic Map Parameter java -

i having lot of methods of type: public static list<eduusers> getdetails(class c, map<string, integer> params) { list<eduusers> details = null; session session = hibernateutil.getsessionfactory().opensession(); transaction tx = null; try { tx = session.begintransaction(); criteria cr = session.createcriteria(c); (map.entry<string, integer> entry : params.entryset()) { cr.add(restrictions.eq(entry.getkey(), entry.getvalue())); } details = cr.list(); tx.commit(); } catch (exception asd) { log.debug(asd.getmessage()); if (tx != null) { tx.commit(); } } { session.close(); } return details; } i trying have generic method them , have written far: public static <t> list<t> getdetails(class<t> c, class<t> b) { l...
Read more

arrays - What causes a java.lang.ArrayIndexOutOfBoundsException and how do I prevent it? -

what arrayindexoutofboundsexception mean , how rid of it? here code sample triggers exception: string[] name = {"tom", "dick", "harry"}; for(int = 0; i<=name.length; i++) { system.out.print(name[i] +'\n'); } your first port of call should documentation explains reasonably clearly: thrown indicate array has been accessed illegal index. index either negative or greater or equal size of array. so example: int[] array = new int[5]; int boom = array[10]; // throws exception as how avoid it... um, don't that. careful array indexes. one problem people run thinking arrays 1-indexed, e.g. int[] array = new int[5]; // ... populate array here ... (int index = 1; index <= array.length; index++) { system.out.println(array[index]); } that miss out first element (index 0) , throw exception when index 5. valid indexes here 0-4 inclusive. correct, idiomatic for statement here be: for (int index = 0; index <...
Read more