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: Simplify the --extcmd test
2010-01-15
Davi
d
A
guil
a
r
t780
0
-
d
iff
t
ool
.
sh: Simp
l
ify the --e
x
tcmd
te
s
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
i
d
Aguilar
git-d
i
f
f
.
txt: Link to
g
i
t-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
d
i
fftool: Al
l
o
w
s
pecifying unconfigu
r
ed commands wi
t
h
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
d
i
fftool--hel
p
er: Remove use of the GIT_
M
ERGE_TO
O
L
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
d
iff
t
ool--helper: Up
d
ate
c
opyright
a
nd remove distracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David A
g
uilar
gi
t
-difftool:
A
dd '--gui'
f
or selecting a GUI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguil
a
r
t7800-difftool: Set a bogus tool
for use by t
e
sts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Ag
u
ilar
help: Do not un
n
ece
s
saril
y
l
ook for a repository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
submodule
.
c:
S
q
u
e
l
c
h a "
u
s
e before
assignment" w
a
r
ning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Agui
l
ar
diff: g
e
nerate
p
retty
fil
e
name
s
in
prep_temp
_
blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
Aguilar
compat: add a basen
a
me() compa
t
ibili
t
y function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
A
gu
i
l
a
r
compat: add
a
m
k
ste
m
p
s
() compati
b
i
lity function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
A
guil
a
r
Add git-rep
l
ace to
.
gitignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
Davi
d
Aguilar
mergetoo
l
--lib
:
add support for araxis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
D
a
v
id Ag
u
ilar
mergetool-
-
l
ib: special
i
ze diff options for em
e
rge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
Davi
d
Agui
l
ar
merg
e
t
o
ol--lib:
s
i
mplify
A
PI
usa
g
e by removing mo
r
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
la
r
dif
f
tool/m
e
rgetool: refa
c
t
or commands to us
e
git-me
r
geto
o
l
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
merget
o
ol
:
u
se $(
.
.
.
)
inst
e
ad of `backti
c
ks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
bash com
p
l
e
t
ion: add gi
t
-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
difftoo
l
:
a
dd support for a di
f
ftool
.
p
r
ompt
c
onf
i
g
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
iff
t
ool
:
a
dd
v
ario
u
s
git-difftool tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
d
iff
t
ool: mo
v
e 'git-d
i
ffto
o
l' ou
t
of contrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
difftool: add
a
-y shortcut
f
o
r
-
-
no-prompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
difft
o
ol: u
s
e perl
b
uilt-ins when testing
f
or msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
difftool:
remove
t
h
e backup
file fe
a
ture
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difft
o
o
l: remove
m
erge options
fo
r
opend
i
ff,
tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Ag
u
ilar
ever
y
day:
u
se the dashl
e
ss for
m
of
g
it-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
Davi
d
Aguilar
contrib
/
difftool: use a s
e
parat
e
config namespace for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
D
avid Agui
l
ar
contrib/di
f
f
tool: Don't
r
e
p
eat
m
erge
tool candidat
e
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
Da
v
id Aguilar
d
ifftool:
p
ut the cursor on the
ed
i
t
a
ble file for
Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David
Aguila
r
difftool
:
fi
x
document
a
ti
o
n proble
m
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David Aguilar
contrib: add 'git di
f
ftool
'
f
o
r
launch
i
ng
c
omm
o
n mer
g
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
D
avid Aguilar
git-mer
g
etool: p
r
o
perly han
d
le "git merge
t
ool -- filename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
D
avid A
g
ui
l
ar
tests: ad
d
a testc
a
se f
o
r "g
i
t sub
m
odule
sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
D
avid Aguil
a
r
git-submodule: add "sync"
command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
g
it-submodule: replace duplicated code with
a m
o
du
l
e_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[PATCH] gitk: Don't show local changes whe
n
we there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree