repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-format-patch.txt: general rewordings and cleanups
2009-04-12
David Ag
u
ilar
mergetool--lib: simplify API usage by remo
v
ing
mo
r
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
fft
o
ol/merget
o
ol: refactor
command
s
to use gi
t
-m
e
rgetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
mergetool: use $(
.
.
.
)
i
n
s
tea
d
of `bac
k
t
i
cks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
ba
s
h completion: add
g
it-d
i
ff
t
ool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Ag
u
ilar
difftool: add support
f
o
r a d
i
f
ftool
.
pro
m
pt config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
difftool:
a
dd variou
s
git
-
d
ifftool tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
difft
o
ol: move
'
g
i
t-difftool' out of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
difftool: add a -
y
shortcut fo
r
--
n
o-promp
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
diff
t
ool: use perl buil
t
-
in
s
when tes
t
ing for msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
ff
t
ool: remove
t
he ba
c
kup file feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool
:
remov
e
m
e
rge
o
ptions
f
or op
e
ndiff,
tk
d
iff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
e
veryda
y
: use
the d
a
s
h
less form of
g
it-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
Davi
d
A
gu
i
lar
con
t
rib/difftool: use a se
p
ar
a
te co
n
fig
n
amespace for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David Agu
i
lar
contrib/d
i
f
f
tool:
D
on't repeat merge tool candidates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Agu
i
lar
difftool:
put the cu
r
sor on the edita
b
le fi
l
e f
o
r Vi
m
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David
Aguilar
d
i
fft
o
ol: fi
x
docu
m
entation pr
o
ble
m
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
Dav
i
d
A
guilar
contrib: add '
g
it difftool'
for launch
i
n
g
common
merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
gi
t
-mergetool:
properly
hand
l
e "git merget
o
ol -- fi
l
ename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David Ag
u
il
a
r
te
s
ts
:
add
a
testcase f
o
r "git s
u
bmodule sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
D
a
vid Aguilar
g
it-submodule:
a
dd "sync" command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
David Ag
u
ilar
git-submodule: replace dupli
c
at
e
d code w
i
t
h a
m
odul
e
_list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[PATCH] gi
t
k:
Don't show l
o
cal chan
g
es w
h
en we there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree