repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
gitweb: Make running t9501 test with '--debug' reliable and usable
2010-01-23
David Aguilar
t7800-difft
o
ol
.
s
h
:
T
est mergetool
.
pro
m
p
t
fall
b
ack
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Agu
i
lar
difftool:
Upda
t
e copyri
g
h
t
notices to list each year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
a
v
id Aguilar
difft
o
ol: Use
eval to expand
'--extcmd' e
x
pression
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
avid A
g
uilar
difftool: Add '-x' and as an alias for
'
--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t7800-difftool
.
sh: Simplify the -
-
extcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id Agu
i
lar
git-diff
.
txt: L
i
nk to gi
t
-dif
f
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
A
guilar
difftool: A
l
low s
p
ecifying unconfigured comma
n
ds with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
Ag
u
ilar
difftoo
l
-
-h
e
lper: Remove use o
f
the
GIT_MERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
diffto
o
l
-
-hel
p
er: Upda
t
e copyr
i
ght
a
nd remove dist
r
acting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
D
a
vid Aguilar
gi
t
-difftool:
A
dd '--gui' f
o
r selecti
n
g a
G
UI to
o
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
D
a
v
i
d
Aguilar
t7
8
00-
d
i
f
f
t
ool
:
S
e
t a b
o
g
u
s
t
ool for use b
y
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Agui
l
ar
h
e
lp: Do n
o
t u
n
necessarily look for a r
e
pository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
Da
v
id
A
guila
r
submodul
e
.
c: Sque
l
ch a "use before ass
i
g
nment"
w
arning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
d
i
ff: ge
n
e
r
ate pretty fil
e
n
a
mes in prep_temp_bl
o
b()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguila
r
compat: add
a
b
a
s
e
name() compatibility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
A
guilar
c
o
mpat
:
add a mkstem
p
s(
)
c
ompatibili
t
y fun
c
t
i
on
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
A
g
uilar
Add g
i
t-replace to
.
gitignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
D
av
i
d Aguilar
merget
o
ol--li
b
: a
d
d suppo
r
t for araxis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David Ag
u
ilar
me
r
getool--lib:
s
p
ecialize dif
f
options
for
e
merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
mergeto
o
l--lib
:
simpli
f
y A
P
I us
a
ge by re
m
oving
more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Agu
i
lar
difftool/mergetool: refactor commands to use git-mergetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uila
r
me
r
g
et
o
ol
:
use $(
.
.
.
) instead of `backticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Ag
u
ilar
bash completion: add git-diff
t
ool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
diffto
o
l: add s
u
p
po
r
t fo
r
a difftool
.
prompt config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Agu
i
l
a
r
d
i
fftool: a
d
d various
g
i
t-difftool tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Ag
u
ilar
difftool: mo
v
e 'git
-
diffto
o
l' out
of
c
on
t
rib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
di
f
ftool: add a
-
y
s
h
ort
c
u
t fo
r
--no-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difft
o
ol:
use
p
erl bu
i
l
t
-ins
when
t
esting for msy
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diff
t
ool: remove
the backup fi
l
e featur
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
A
g
uilar
difftool: remove
merg
e
opt
i
ons for o
p
endi
f
f, tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
e
v
eryday: use
t
he dashless form of
g
it-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
D
avid Aguilar
contrib/di
f
ftool:
u
s
e
a
s
e
pa
r
ate c
o
nfig namespace for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
D
avid Aguilar
contrib/difftool: Don't repeat merge
t
oo
l
ca
n
didates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
D
avid Agu
i
lar
dif
f
tool: put the cursor
o
n the editable file for
V
i
m
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David A
g
uilar
difftool: fix documentation problems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David Aguilar
contrib: ad
d
'g
i
t difftool' for launc
h
ing comm
o
n merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
D
a
vid
A
gui
l
ar
git-mer
g
etool
:
pr
o
p
e
rly handle "git mergetool --
filena
m
e"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
te
s
ts: add a t
e
stcase
for "g
i
t submodule sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David Agui
l
ar
git-submodule:
a
dd "
s
ync" c
o
mm
a
nd
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
git
-
submodule:
replace duplicated cod
e
with
a
modul
e
_list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
D
avid Aguilar
[PA
T
C
H] g
i
tk: Do
n
't show local changes when we there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree