repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
difftool: Fix '--gui' when diff.guitool is unconfigured
2010-03-28
Davi
d
Ag
u
ila
r
dif
f
t
o
ol: Fix '--gui' when diff
.
guitool
is unconfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t
7800-d
i
fftoo
l
.
sh: Test mergetool
.
prompt fallb
a
c
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
Dav
i
d
A
gu
i
lar
di
f
ftool: Upd
a
te c
o
pyrig
h
t no
t
i
c
e
s
t
o list eac
h
year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Ag
u
ilar
diff
t
ool: Use
eval to expand
'--extcmd' express
i
ons
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id Aguil
a
r
difftoo
l
:
Add '-x' and as an alia
s
for '--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id Aguilar
t78
0
0-difftoo
l
.
sh: Simplify the --ex
t
cmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
Aguilar
git-diff
.
txt: L
i
n
k
t
o
git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguil
a
r
difftool: Allow speci
f
ying
u
ncon
f
igured
commands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id A
g
uila
r
diff
t
o
ol--helper: Remove use o
f
t
h
e GIT_MERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguila
r
difftool--hel
p
er: Updat
e
co
p
yr
i
ght and remove distr
a
cting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
D
av
i
d Agui
l
a
r
git-difftool: Add '--gui'
fo
r
selecting a GU
I
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Dav
i
d
A
g
u
ilar
t
7800-difftool: Set a bogus to
o
l for
use by
t
ests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
hel
p
: Do not unnecessar
i
l
y
look for a
r
epository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
Dav
i
d
Aguilar
submodu
l
e
.
c: Squelch a "use before assign
m
ent"
w
arning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d
Aguilar
dif
f
: generate pretty filenam
e
s in prep_temp_
b
lob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
avid
A
guilar
co
m
pat: a
d
d a basename() compatibility fu
n
c
t
ion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
Aguilar
compat:
a
dd a mkstemps() co
m
patibility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
A
guilar
Add git-replace to
.
gitignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
D
avid Aguilar
mergetool--
l
ib: a
d
d s
u
ppor
t
fo
r
araxis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David Aguila
r
m
e
rgetool--lib: speci
a
lize diff
o
p
t
ions for emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Aguil
a
r
mergetool--lib: simplify API usage by
r
em
o
v
i
ng more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
difft
o
ol/mer
g
etool: refac
t
o
r commands to
use
g
i
t
-mergeto
o
l
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
me
r
getool: use $(
.
.
.
) ins
t
e
ad of `back
t
icks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
b
a
sh co
m
pletion: add git-difft
o
ol
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
diffto
o
l: add su
p
port for a difftool
.
prompt config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
d
ifftool: add
v
arious git-difftool tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: mo
v
e 'git
-
d
i
f
ftool' out of
c
ontrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diffto
o
l: add a -y
sh
o
r
t
cut for -
-
no-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
di
f
f
t
o
o
l:
u
se perl built-ins wh
e
n testing for msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
la
r
difftool: remove the backup file feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
diff
t
ool
:
r
emov
e
mer
g
e
options for op
e
ndiff, t
k
diff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
Da
v
id Aguilar
everyday:
u
se the d
a
s
hl
e
ss form o
f
git
-
init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
D
a
vid Agui
l
ar
contrib/difftool:
use
a
separate config nam
e
space f
o
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
contrib
/
difftool: Do
n
't repeat me
r
g
e tool
candi
d
ates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difftool
:
put
t
h
e
curs
o
r
o
n
the editable
fil
e
for V
i
m
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
Dav
i
d Aguilar
difft
o
ol:
fix docu
m
en
t
ation problems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
D
a
vid Agui
l
ar
contrib: add 'git difftool' for launching commo
n
merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-mergetool: properly handle
"git
m
ergetool -- filename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
Da
v
id Aguil
a
r
tests:
add
a
testcas
e
f
o
r "git su
b
m
odule sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
Dav
i
d Aguilar
git-submodule: add "sync" command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
Dav
i
d Agui
l
ar
git-su
b
m
o
d
ule: repl
a
ce duplicated c
o
d
e with a modu
l
e
_
l
i
st
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[PATCH] g
i
tk: Don
'
t sh
o
w local
chan
g
es when
w
e
there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree