repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-diff.txt: Link to git-difftool
2010-01-10
David Agui
l
ar
git-diff
.
txt: Link
t
o git-
d
if
f
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguila
r
difftoo
l
: Allow specifyi
n
g unconfigured comm
a
nds with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Aguilar
diff
t
o
o
l--helper: Remov
e
use o
f
the
G
I
T
_MERGE
_
TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Agu
i
l
ar
diff
t
ool--helper: Update copyright an
d
remove d
i
stracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
git-difftool: Add
'
--gui' for select
i
ng a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t7800-di
f
ftool: Set a bogus tool for us
e
b
y
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
Davi
d
Aguilar
h
e
lp: Do
n
ot unne
c
essarily look f
o
r a repos
i
tory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Ag
u
il
a
r
submodule
.
c: Squelch
a
"
use
before assignment"
w
arning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
d
iff: generate pretty filena
m
es in pr
e
p_
t
emp_
b
lob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
A
guilar
compat: add a b
a
sename() compatibility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Aguilar
compat
:
add
a mkst
e
mps() comp
a
tibil
i
t
y fun
c
tion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
avid Aguilar
Add git
-
replace to
.
gitignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
Da
v
id
Aguila
r
merget
o
ol
-
-
lib: add
s
upport for araxis mer
g
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David Aguilar
m
e
rgetool--lib: spec
i
a
l
i
z
e d
i
f
f
options f
o
r emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
Dav
i
d
Ag
u
i
lar
me
r
getool--lib:
si
m
plify API usage
by remo
v
ing more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
diffto
o
l
/
m
e
rge
t
ool: re
f
acto
r
command
s
to
u
s
e git-mergetoo
l
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id
Aguilar
mergetool: u
s
e $(
.
.
.
) instead
of `ba
c
kticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d
Aguilar
bash completion:
add git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id
Aguilar
dif
f
tool:
a
dd
s
upport for a difftool
.
pr
o
mpt
c
onfig
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Agui
l
ar
difftool: ad
d
various
git-difftool t
e
sts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Agu
i
lar
difftool: move 'git-dif
f
tool' out of cont
r
ib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avi
d
Agu
i
lar
difftool: ad
d
a -y shortcut for --n
o
-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Agu
i
lar
difftoo
l
: us
e
p
e
r
l built-ins
when testing f
o
r
m
s
ys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
diffto
o
l: r
e
m
ove the
backup
f
i
le
f
eatur
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
difftool:
remov
e
merge options for ope
n
diff,
tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
Davi
d
Aguilar
e
v
eryday: use the dashless
f
orm of
git-i
n
it
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
cont
r
ib
/
dif
f
tool: use a sep
a
rate co
n
fig namespa
c
e
f
o
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
Dav
i
d Ag
u
il
a
r
cont
r
ib
/
d
i
f
f
tool
:
Don't repeat merge tool candidates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David
Aguila
r
difftool: put the
c
ursor on th
e
editable file
f
o
r
Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguil
a
r
diffto
o
l: fix
d
ocumenta
t
ion problems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David
A
guila
r
cont
r
ib: add 'git di
f
ftool
'
fo
r
launchin
g
common merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David
Ag
u
ilar
git
-
m
e
rge
t
ool: p
r
op
e
rly handle
"git merge
t
ool -- filenam
e
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
tests:
a
d
d
a
t
es
t
case for
"
git submod
u
le sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David Aguilar
g
i
t-submodule: add
"s
y
nc" comman
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
D
a
vid Aguilar
git-submodule: r
e
plac
e
duplicated c
o
de with a module_
l
ist
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Agu
i
lar
[P
A
T
C
H] gitk
:
Don't show local changes when we there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree