I have a situation where somebody got confused while trying to
commit/push/pull from the repository and some changes to some files
got lost.
How can I tell which files got selected in a merge?
I have a log file such as shown below (produced by "git log
--full-history --name-status --parents --dense")
I know that commit 693a2 had the correct files, but 1e5e6 does not.
(It has an older version of the file).
So far, I've noticed one file that has gone bad in this process, and
I'm worried that there may be others, so I would like to figure out
exactly what got changed how at each step of the process.
But I can't figure out how to tell git-log to tell me which files it
kept when merges occurred.
Any thoughts/tips/advice?
Thanks...
--wpd
commit 1e5e614e9d27902af6e1edb6ddbbca224acf3de2
693a25dc0dadfcc13786051fed9d066dac4e088c
6b1747651d06b69f96337633e785808422ed1754
Merge: 693a25d 6b17476
Author: Shawn Kelly <skkelly@xxxxxxx>
Date: Fri Mar 25 14:39:01 2011 -0400
Merge branch 'master' of skkbri2:bri2
commit 693a25dc0dadfcc13786051fed9d066dac4e088c
8da5a19daa298f87307d168c82b8b023bfe2ac58
63252fcde7ee61c06e65cd8036cec8e73d529f1c
Merge: 8da5a19 63252fc
Author: Shawn Kelly <skkelly@xxxxxxx>
Date: Fri Mar 25 14:36:02 2011 -0400
layout merge
commit 6b1747651d06b69f96337633e785808422ed1754
63252fcde7ee61c06e65cd8036cec8e73d529f1c
Author: Shawn Kelly <skkelly@xxxxxxx>
Date: Wed Mar 23 19:12:27 2011 -0400
acwtgtvss1a
A oalib/bri2/acwtgtvss1a/constraint/hierDesign.oa
A oalib/bri2/acwtgtvss1a/constraint/master.tag
A oalib/bri2/acwtgtvss1a/constraint/prop.cfg
A oalib/bri2/acwtgtvss1a/layout/layout.oa
A oalib/bri2/acwtgtvss1a/layout/master.tag
A oalib/bri2/acwtgtvss1a/symbol/master.tag
A oalib/bri2/acwtgtvss1a/symbol/symbol.oa
commit 63252fcde7ee61c06e65cd8036cec8e73d529f1c
dbe78c36bd1440ad537c8e55c915cb30073cbf54
18245190b4ae4c21a301d58a02d7c1d969a7700b
Merge: dbe78c3 1824519
Author: Shawn Kelly <skkelly@xxxxxxx>
Date: Wed Mar 23 18:59:33 2011 -0400
Merge branch 'master' of wfebri2:bri2
commit 8da5a19daa298f87307d168c82b8b023bfe2ac58
25316a8ef872508934a68916c27bc1e17dcdbe0e
Author: Shawn Kelly <skkelly@xxxxxxx>
Date: Wed Mar 23 18:57:06 2011 -0400
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html