Sven Strickroth
b8add6c42e
Allow to propagate checkout callbacks to git HARD reset
...
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2014-08-03 16:29:51 +02:00
Edward Thomson
a4e2c36a66
merge: checkout default shouldn't clobber given
2014-04-23 19:43:35 -04:00
Jacques Germishuys
6fefb7af84
Capture conflict information in MERGE_MSG for revert and merge
2014-04-14 16:16:22 +02:00
Edward Thomson
d9fdee6e4c
Remove git_merge_result as it's now unnecessary
2014-03-20 09:25:09 -07:00
Edward Thomson
5aa2ac6de1
Update git_merge_tree_opts to git_merge_options
2014-03-20 09:25:08 -07:00
Edward Thomson
02105a27f0
Change signature of git_merge to take merge and checkout opts
2014-03-20 09:25:07 -07:00
Edward Thomson
05d47768ca
Introduce git_merge_file for consumers
2014-03-20 09:25:05 -07:00
Ben Straub
a2ce19ca68
Prevent user's merge.conflictstyle from breaking tests
2014-02-05 13:35:26 -08:00
Ben Straub
586be3b889
Add reflog parameters to git_reset
2014-02-03 15:05:55 -08:00
Carlos Martín Nieto
a1bbc0ce20
merge: rename _oid() -> id()
...
Following the rest of the series, use 'id' when refering to the value.
2014-01-25 08:15:44 +01:00
Carlos Martín Nieto
d541170c77
index: rename an entry's id to 'id'
...
This was not converted when we converted the rest, so do it now.
2014-01-25 08:15:44 +01:00
Edward Thomson
db3462ce77
Support union merges
2014-01-20 17:15:15 -05:00
Edward Thomson
6891a862bb
Load merge.conflictstyle setting from config
2014-01-20 17:15:13 -05:00
Edward Thomson
e651e8e2b5
Introduce diff3 mode for checking out conflicts
2014-01-20 17:15:13 -05:00
Edward Thomson
6b92c99bcb
Don't try to merge binary files
2014-01-20 17:15:12 -05:00
Edward Thomson
c1d648c5c6
merge_file should use more aggressive levels
...
The default merge_file level was XDL_MERGE_MINIMAL, which will
produce conflicts where there should not be in the case where
both sides were changed identically. Change the defaults to be
more aggressive (XDL_MERGE_ZEALOUS) which will more aggressively
compress non-conflicts. This matches git.git's defaults.
Increase testing around reverting a previously reverted commit to
illustrate this problem.
2014-01-20 17:15:11 -05:00
Carlos Martín Nieto
0b28217bda
refs: remove the _with_log differentiation
...
Any well-behaved program should write a descriptive message to the
reflog whenever it updates a reference. Let's make this more prominent
by removing the version without the reflog parameters.
2014-01-15 13:32:43 +01:00
Ben Straub
1782038144
Rename tests-clar to tests
2013-11-14 14:05:52 -08:00
