repo.or.cz
/
git
/
wpalmer.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Teach diff --submodule that modified submodule directory is dirty
2010-01-23
David Aguilar
t
7
800-difftool
.
sh: Test me
r
getoo
l
.
p
rompt
fallb
a
ck
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Ag
u
ilar
diffto
o
l: Update copyright notices to
l
ist each
y
ear
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
a
v
i
d Aguilar
diffto
o
l
:
Use eval
t
o
expand
'
-
-extcmd' ex
p
r
e
ssions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David
Aguilar
diff
t
ool: Add
'-x' and as an alias for '--
e
xtcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
Aguilar
t7800-difftool
.
sh: S
i
mpl
i
fy the --extc
m
d test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
git-diff
.
txt: Link
t
o git-difft
o
ol
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Ag
u
ilar
d
i
ff
t
oo
l
:
A
llow
s
pe
c
i
fyin
g
unconfigured comma
n
ds with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
Aguil
a
r
difftool--helper: Re
m
ove use of the GIT_MERGE_TOO
L
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguila
r
diff
t
oo
l
--helper: Up
d
ate
c
opyright and remo
v
e distrac
t
ing
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Da
v
i
d
Aguilar
git-difftool: Add
'
--gui' for
s
e
l
ecti
n
g
a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Dav
i
d Agu
i
lar
t7800-dif
f
too
l
: Set a bo
g
us tool for use by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David
A
guilar
help: Do not unnecessarily look for a
repository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David
A
g
u
i
l
ar
submod
u
le
.
c: Squelch a
"use b
e
fore as
s
ignment"
w
arni
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
A
guilar
diff: g
e
n
erate
pretty fil
e
na
m
es
in pre
p
_temp_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
A
guilar
compat:
add a
b
asenam
e
() compati
b
ility
function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
c
ompat: a
d
d a mkstemps(
)
compatibi
l
ity
f
u
n
ction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Agu
i
lar
A
dd git-r
e
pla
c
e to
.
gitig
n
ore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Aguila
r
me
r
g
etool-
-
lib: a
d
d
s
upport for
araxis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
Davi
d
Agu
i
la
r
mer
g
etool--lib: speciali
z
e diff optio
n
s fo
r
e
m
e
rge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
m
e
r
g
e
tool--lib: simplify API u
s
age by removing m
o
re
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguila
r
d
i
f
ftool/m
e
rg
e
tool:
r
efactor co
m
mands to use git-mer
g
e
t
o
o
l
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Agui
l
ar
me
r
getool: use
$
(
.
.
.
) instead of
`
backticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bash
c
ompletion:
a
dd
g
it-difftoo
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguila
r
difft
o
ol: add sup
p
ort for a difftool
.
pro
m
pt co
n
f
ig
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
difft
o
ol: add various git-diff
t
ool
t
e
s
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
difftool
:
m
o
ve 'git-difft
o
ol'
o
ut of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
fftool: add a -y shortcu
t
for --n
o
-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
difftool: use perl built-in
s
w
h
en testing for msy
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
dif
f
tool: r
e
m
o
ve th
e
backup file f
e
a
t
u
re
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
difftool
:
remove merge options fo
r
o
pendiff, t
k
diff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
everyday: use the dashless form
of git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David Aguila
r
contrib/d
i
fftool: use a separ
a
te co
n
fig name
s
p
ace for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David Agui
l
ar
c
ontrib/difftool: Don't repe
a
t merge too
l
ca
n
d
i
d
a
te
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
D
a
vid
A
guilar
diff
t
o
o
l
:
put t
h
e
cursor on
t
he editabl
e
fil
e
for V
i
m
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difft
o
ol: fix docu
m
entati
o
n
problem
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David Aguilar
contri
b
: add 'git difftool' for launching
co
m
mon m
e
rge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
Davi
d
Aguilar
git-mergetool
:
properly handle "git mergetool --
filename
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
t
e
sts:
add
a
tes
t
case for "git
submod
u
l
e
sync
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
D
a
v
id Aguil
a
r
git-s
u
bmodule: a
d
d "sync" comman
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
Da
v
id Aguilar
git-submod
u
l
e: replace duplicated cod
e
with a module_list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
Dav
i
d Aguilar
[PAT
C
H] gitk: D
o
n
'
t
show loca
l
changes when w
e
t
h
e
r
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree