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 1.7.2
2010-07-19
David Agu
i
l
ar
Documentation:
E
xpla
i
n git
-
mergetool's
u
se
o
f t
e
mporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David Agui
l
ar
M
a
ke
f
ile: Remov
e
usag
e
of dep
r
e
cate
d
Python "has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
D
a
vid Ag
u
ilar
difftool:
F
ix '--gui'
w
hen dif
f
.
g
u
i
tool is unconf
i
gur
e
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t7800
-
difftool
.
sh: Test mergetool
.
p
r
ompt f
a
llback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David A
g
u
i
lar
d
iff
t
o
ol: Update
copyright notices to l
i
st each y
e
a
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
i
d Aguilar
difftool: Use e
v
al
to expand '-
-
extcmd' expr
e
ssions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David A
g
uilar
di
f
f
tool:
A
dd '-x' a
n
d as an alias for '--extc
m
d'
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
Davi
d
A
guila
r
git-diff
.
txt: L
i
nk t
o
git-dif
f
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id
A
g
uilar
diffto
o
l: Al
l
ow spe
c
ifying
u
nco
n
figured commands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
di
f
ftool-
-
he
l
per: Remove use of the
G
I
T
_MERG
E
_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool--
h
elpe
r
: U
p
date co
p
yright
a
n
d rem
o
ve distracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
git-difftool: Add '--
g
ui
'
for
selectin
g
a GUI
t
ool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
D
a
vid Aguilar
t7800-diff
t
ool: Set a
bo
g
u
s tool for
u
se by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
D
a
vid Aguilar
hel
p
: Do not unn
e
cessa
r
il
y
l
ook for a reposit
o
r
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
submodu
l
e
.
c: Sq
u
elch a "use before assign
m
ent" w
a
rning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
diff:
generate p
r
etty fil
e
n
a
m
e
s
in prep_tem
p
_
b
lob(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
avid Agu
i
lar
compat: add a
b
asename() co
m
patibility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
com
p
at:
a
dd a mkstemps() compati
b
ility functio
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Add
g
i
t-replace t
o
.
gitignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David A
g
uilar
mer
g
etool--li
b
: add s
u
pport fo
r
a
r
axis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
Dav
i
d Agu
i
lar
mergetoo
l
-
-lib: sp
e
ciali
z
e diff
optio
n
s for eme
r
ge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
merge
t
ool--lib: simplify API usage by re
m
oving more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftoo
l
/mergetool: refactor commands to use
git-m
e
rgetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
m
e
r
g
etool:
u
se
$
(
.
.
.
) instead of
`backticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
bash comple
t
ion
:
add git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Ag
u
ilar
d
i
ff
t
ool: add support fo
r
a d
i
fftool
.
p
r
o
m
pt con
f
ig
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diff
t
o
o
l
: add various git-difftool tes
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
difftool:
m
ove 'git-d
i
fftool' o
u
t of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Ag
u
ilar
difftool: add
a
-
y shortcut for -
-
no-promp
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
a
r
di
f
ftool: use pe
r
l built
-
i
ns when t
e
sting for
m
s
ys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
difftool: remove
t
he backup f
i
l
e
feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Ag
u
ila
r
difft
o
o
l
: remove m
e
r
g
e options for ope
n
diff, tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
everyday:
u
se the dashless for
m
of git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
Davi
d
Aguilar
contrib/di
f
fto
o
l: us
e
a separate config na
m
e
space for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
Da
v
id Aguilar
contrib/
d
ifftool: Don
'
t re
p
e
at merge tool cand
i
dates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David A
g
uilar
d
ifftool:
p
u
t the cu
r
sor on th
e
edit
a
b
le file for Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
D
a
vid Aguilar
di
f
fto
o
l: fix docum
e
ntation
p
r
ob
l
em
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
Dav
i
d Aguil
a
r
contrib: add 'git d
i
fft
o
ol' for
l
aunching
comm
o
n mer
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-mergetool: proper
l
y
handle
"
git mergetool --
filename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
Dav
i
d
Aguilar
test
s
:
add a t
e
stcase for "git sub
m
odul
e
sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
D
avi
d
Ag
u
ilar
gi
t
-sub
m
odule
:
add "sync" command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
git-sub
m
od
u
le: replace dupl
i
cated c
o
d
e with a module
_
list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
Davi
d
Aguil
a
r
[PATCH] gitk
:
Don
'
t
s
how local cha
n
ges when we
t
h
e
re
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree