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
git-diff.txt: Link to git-difftool
2010-01-10
Davi
d
Aguilar
g
i
t
-diff
.
t
x
t: L
i
nk to
git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Agu
i
la
r
di
f
ft
o
ol: Allow specifying u
n
configured commands
w
i
t
h
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David A
g
uilar
difftoo
l
--helper: R
e
move
u
se of t
h
e GIT_
M
ERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Agui
l
ar
d
i
ff
t
o
o
l--h
e
l
pe
r
:
U
pdate
copyright and remo
v
e distractin
g
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David
Agu
i
la
r
git-difftool: Add '--gui' for sele
c
ting a
G
UI t
o
ol
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
Dav
i
d Aguilar
t7800-difft
o
o
l: Set a b
o
gus tool for use
b
y
t
e
sts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
D
a
vid Aguila
r
help: Do n
o
t unnecessarily look for a repository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
Da
v
i
d Ag
u
ila
r
submo
d
u
le
.
c
: Squelch a "use bef
o
re
a
s
sign
m
ent" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguil
a
r
diff:
g
ener
a
te pretty filename
s
in prep
_
t
e
mp_blo
b
()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d Aguila
r
compat
:
a
dd a base
n
ame()
compatib
i
lity function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id
Aguil
a
r
compat: a
d
d a mkstemps(
)
co
m
patibility
functio
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d Aguilar
Add git-replace to
.
gitignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David
A
guilar
m
e
rgetool--lib: add s
u
pport for ara
x
is m
e
r
g
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David Aguilar
merg
e
tool--lib: sp
e
cializ
e
diff
options for eme
r
ge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
m
e
rgetool--lib: simplify
A
PI usage
by
r
emoving more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Agu
i
l
a
r
dif
f
tool/merg
e
tool: refac
t
or commands to
u
se git-mergetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
i
d
Agui
l
a
r
mergetool: use $(
.
.
.
)
inste
a
d of `
b
ackticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
bash completion:
add git
-
d
if
f
tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diff
t
ool: add
support
f
or
a
dif
f
too
l
.
prompt con
f
ig
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
A
guil
a
r
di
f
ft
o
ol: a
d
d v
a
rious git-difftool tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Ag
u
il
a
r
difftool: move 'g
i
t-difftool' out of cont
r
ib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difft
o
ol:
a
dd
a
-
y
s
hortcut
f
or --no-prompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
d
i
fftool: use per
l
built-ins whe
n
te
s
ti
n
g for msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
d
iff
t
ool:
r
emove the bac
k
up f
i
le fe
a
ture
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
difft
o
ol:
remove merge
o
p
tion
s
for opend
i
f
f, tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
everyday: use the dashles
s
form of git-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
D
avid Ag
u
ilar
contr
i
b/difftool
:
use a s
e
p
arate
c
onfig names
p
ace for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
contri
b
/difftool:
D
on't repeat merge tool candida
t
es
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David
A
gui
l
ar
d
i
fftool: put
the
c
urs
o
r
on the edi
t
able f
i
le for Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David
Aguil
a
r
difftool:
fix docume
n
tat
i
o
n
p
roblems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David Aguilar
contrib: add 'g
i
t difftool' f
o
r launching
common m
e
rge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Agu
i
lar
git-mer
g
eto
o
l:
properly handle "git
m
e
rgeto
o
l
-- fi
l
ename
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David
Aguil
a
r
tests: add a
te
s
tcase for "gi
t
su
b
mod
u
le sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
Da
v
id Ag
u
ilar
git
-
submodule: a
d
d "sync" command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
D
a
vid Ag
u
i
l
a
r
git
-
s
ubm
o
d
ule: replace du
p
l
i
cated c
o
de with a module_l
i
st
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David Ag
u
ilar
[PATCH] gitk: Don
'
t show local chang
e
s
w
hen we t
h
ere
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree