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
Documentation: tweak description of log.date
2010-08-17
David Aguilar
mergetool: Skip autoresolved p
a
ths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Da
v
id Ag
u
ilar
D
o
c
u
m
entation
:
Explain g
i
t-mergetool's use of tempo
r
ary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
D
a
vid Ag
u
ila
r
Makef
i
le: Remo
v
e
u
sag
e
of
d
eprecated
P
ython "ha
s
_ke
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Agu
i
la
r
difftool: Fix
'
--gui' when diff
.
guitool
is unconfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t7800-difft
o
ol
.
sh:
Test mergetoo
l
.
prompt fall
b
ack
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David
A
gui
l
ar
dif
f
tool:
U
pdate
c
opyright notic
e
s to
li
s
t eac
h
y
ear
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
Aguilar
d
i
ffto
o
l: Use ev
a
l to e
x
pand '--extc
m
d' expressio
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguila
r
difftool: Add '-
x
'
a
n
d
as an
a
lias for
'
-
-ex
t
cmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid Aguilar
t7800-difftool
.
sh: Simpl
i
fy
the --extcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
Aguilar
git-d
i
ff
.
txt: Link to git-d
i
f
f
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
Agui
l
ar
dif
f
t
o
ol: Al
l
ow specifying unconfigured
c
omm
a
nds with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
A
guilar
difftool-
-
h
el
p
er: Remove use of the
GIT_M
E
RGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David A
g
ui
l
a
r
d
ifftool--helpe
r
: Updat
e
copyrig
h
t and remove
d
i
s
tracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Ag
u
ilar
git-
d
ifftool
:
Add '--gui'
for sele
c
ting a GUI t
o
o
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Da
v
id Aguilar
t7800
-
difftoo
l
:
S
e
t
a
bogus tool fo
r
us
e
by
t
ests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
D
a
vid
A
guilar
help: Do
not un
n
ecessarily look for a repos
i
tory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
Davi
d
Aguilar
su
b
mo
d
ule
.
c: S
q
u
e
lch a "us
e
before as
s
ignment"
w
arning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Agu
i
lar
d
iff: ge
n
erate
p
r
e
t
ty filenames in
prep_temp_
b
lob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguila
r
compat:
a
dd
a basename(
)
compatibil
i
ty functi
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
avi
d
Aguil
a
r
comp
a
t: add a mkst
e
mps(
)
compatibility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David A
g
ui
l
a
r
Add git-replace to
.
git
i
g
n
ore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
Da
v
id
Agu
i
lar
mer
g
etool
-
-lib: a
d
d
s
upport for araxi
s
mer
g
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
D
avid Aguilar
merge
t
oo
l
--li
b
:
s
p
ecia
l
ize d
i
ff opt
i
ons for emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
D
a
vid Aguilar
mer
g
et
o
ol
-
-lib
:
simplify API us
a
ge by
removing more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
dif
f
tool/merge
t
ool:
r
efactor commands
to use git-merg
e
t
ool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avi
d
Aguila
r
mergetool:
u
s
e
$(
.
.
.
) inst
e
ad of `b
a
c
k
ticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
id
Agui
l
ar
bash completion: add git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
d
ifftool: add support fo
r
a dif
f
too
l
.
prompt config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid A
g
uilar
difftool: add
v
ari
o
us
git-difftoo
l
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
difftool: mov
e
'
g
it-difftool' out
of
c
ontrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
difft
o
ol: add a -y shortcut for --no-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
d
iff
t
ool: use perl b
u
ilt-ins
w
hen testing for msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
difftool: remov
e
t
h
e backu
p
fi
l
e feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
fftool: remov
e
merge options f
o
r op
e
ndif
f
,
t
kdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
Da
v
id Agui
l
ar
every
d
ay: use
t
he
d
ashless form of gi
t
-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
contrib/d
i
ff
t
ool: use a sepa
r
ate config nam
e
spac
e
for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
contrib/difftoo
l
: Don't repeat me
r
ge t
o
ol c
a
ndidates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
Davi
d
Agui
l
ar
dif
f
tool
:
put the curso
r
on
the
e
d
i
table fi
l
e for Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difftool:
f
i
x document
a
tion problems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
D
a
v
id
Aguilar
cont
r
ib: add 'git di
f
ftool' for l
a
unching commo
n
merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
Davi
d
Aguil
a
r
g
it-mergetool: prope
r
l
y
h
andle "git m
e
r
g
etool -- f
i
len
a
me"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
t
ests: a
d
d a testcase for "gi
t
s
ubmod
u
le syn
c
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David A
g
uilar
g
it-submod
u
l
e
:
a
d
d "sync" c
o
mmand
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
D
a
vid Aguilar
git-sub
m
odule: re
p
lace du
p
l
icated code w
i
t
h a module_list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
D
a
vid Aguilar
[PATCH] gitk: D
o
n
't show local cha
n
ges when
we
t
h
ere
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree