repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t7800-difftool.sh: Test mergetool.prompt fallback
2010-01-23
David Aguilar
t7800
-
difftool
.
sh: Test
mergetool
.
prompt fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
D
avid Agui
l
ar
difftool: Update c
o
py
r
ight notices
t
o list eac
h
year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
d
ifft
o
o
l: Use eval
to
ex
p
and '--e
x
tc
m
d' ex
p
re
s
sions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid Agui
l
ar
difftool:
A
dd
'
-x'
and as
a
n
alias for '-
-
extcm
d
'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David A
g
uila
r
t7800-diff
t
ool
.
s
h
:
S
implify the --e
x
tcmd
t
est
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
Ag
u
i
l
a
r
git-di
f
f
.
txt:
Link to
g
it-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
av
i
d Ag
u
ilar
d
ifftool: Allo
w
speci
f
yin
g
un
c
onf
i
gured comm
a
nds with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
A
guilar
di
f
ftool--he
l
per: R
e
move use of the GIT_MERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
diffto
o
l--h
e
lp
e
r:
Update
c
opyright
a
nd remove dist
r
acting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
git-difftool
:
Add '--
g
ui' for s
e
lecti
n
g a GUI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
Dav
i
d
Ag
u
ilar
t7800-difftool: Set a
b
o
gu
s
t
ool for use
b
y
t
e
s
ts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
hel
p
: D
o
not un
n
ecessari
l
y
look for
a rep
o
s
i
tory
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
D
a
vid Aguil
a
r
s
u
b
modul
e
.
c
: S
q
u
e
lch a "use before assignment" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
dif
f
: g
e
nerate p
r
etty
filenam
e
s
i
n
prep_temp_
b
lob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
com
p
at: add a basename
(
) compat
i
bility
f
unction
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Agu
i
l
a
r
compat
:
add
a mkste
m
ps() compatibility functi
o
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Agu
i
lar
Add git-repl
a
c
e to
.
gitignor
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
m
e
r
g
etool--li
b
: a
d
d support
for araxis m
e
rge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
Da
v
i
d
A
guilar
mergetool--lib
:
specialize diff options for emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
me
r
geto
o
l--l
i
b:
s
i
mplif
y
API u
s
age by r
e
moving more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
difft
o
o
l
/mer
g
etool: r
e
factor
c
omm
a
nds to use
g
i
t
-me
r
getool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vi
d
Agu
i
lar
m
e
rgeto
o
l: use $(
.
.
.
) instead of
`
b
a
ckticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguila
r
b
a
sh co
m
pleti
o
n:
add git-diffto
o
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
difftool:
a
dd suppo
r
t
f
or a
d
iff
t
ool
.
prompt config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
difftool: add various git-difftool tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
A
guilar
d
if
f
tool: move 'git
-
difftool' out
of
c
on
t
rib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
i
d
Ag
u
il
a
r
difftoo
l
: a
d
d a -
y
sho
r
tcut for
-
-no-prompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
difftool
:
us
e
perl built-i
n
s when tes
t
ing fo
r
msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
difftool:
r
emove the backup file feature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
dif
f
tool:
remove mer
g
e options for
op
e
ndiff
,
tk
d
iff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Aguila
r
e
v
ery
d
ay: use
the dashles
s
form o
f
git-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
contrib/diff
t
ool
:
use a separate config namespace
for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
Da
v
id Aguilar
contrib/diff
t
ool: Don't repeat me
r
g
e
tool c
a
ndidat
e
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
d
ifftool:
p
ut th
e
cursor on
t
he e
d
itable file for Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
D
avid Aguilar
d
i
fftoo
l
: fix documentat
i
on
p
roblems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David
A
g
u
i
lar
contrib: ad
d
'git
d
ifftool' f
o
r lau
n
ch
i
n
g
common merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-
m
ergetool:
p
r
o
p
erly handle "git mer
g
e
t
ool
-
- filenam
e
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
Da
v
i
d A
g
u
ilar
te
s
ts: a
d
d a
test
c
ase for "gi
t
submo
d
ule
s
ync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David
A
guilar
git-submod
u
le:
a
d
d
"sync" command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Ag
u
ilar
g
i
t-
s
ubmodule
:
replace duplicated co
d
e with a
m
od
u
l
e
_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[PATCH
]
gitk
:
Don't sho
w
loc
a
l change
s
whe
n
we
there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree