repo.or.cz
/
git
/
mingw
/
j6t.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
cat-file: minor style fix in options list
2010-08-17
David
A
guil
a
r
merget
o
ol: Ski
p
au
t
o
r
esolved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Da
v
id Aguilar
Documentation: Explain git-mergetool's use
of temporar
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David Agui
l
ar
Makefi
l
e
:
Rem
o
v
e
us
a
ge o
f
d
e
precat
e
d P
y
thon "has_ke
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Ag
u
ila
r
diffto
o
l: Fix '--gui' when
d
i
f
f
.
guitool is unconfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t7800-d
i
ffto
o
l
.
s
h: Test mergetool
.
prompt fall
b
ac
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
Da
v
i
d
Aguilar
difft
o
ol: Update copyr
i
ght notic
e
s
to lis
t
each y
e
ar
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid Aguila
r
di
f
ftool: Use eval to expand '--extcm
d
' expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
avid Agui
l
ar
diffto
o
l: Add
'
-x
'
and as an
a
lias for '--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id Aguilar
t780
0
-difftool
.
s
h: Simplify the --extcmd
t
e
s
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguil
a
r
git
-
diff
.
txt: Link t
o
git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
v
id
A
g
u
i
l
ar
d
i
fftool: Al
l
ow specifyi
n
g
u
nconfigu
r
ed commands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d Aguilar
dif
f
tool--help
e
r:
Remove use
o
f the GIT_MERGE_
T
OOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool--helper: Update copyright a
n
d remove distracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
git-difftool: Ad
d
'
-
-gui' for
s
el
e
cting
a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Da
v
id Aguil
a
r
t7800-difftool:
Set a bogus tool
f
o
r
use by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
Da
v
id Aguilar
h
e
lp:
Do not
u
nn
e
ce
s
sarily look
f
o
r a
repos
i
tory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
D
avid A
g
uilar
submodule
.
c: Sque
l
ch a "
u
se be
f
o
re assignment" war
n
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
diff:
g
en
e
r
a
t
e pretty f
i
lenames in prep_te
m
p_bl
o
b()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
A
guilar
comp
a
t
: add
a
basename(
)
c
o
m
p
atibility func
t
ion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d
A
guilar
c
ompa
t
: add
a
mkstemps() com
p
atibility f
u
nction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David A
g
ui
l
ar
Add git-re
p
lace to
.
git
i
g
nore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Agui
l
ar
merg
e
tool--lib: add
s
upp
o
rt for ara
x
is
m
erge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David
Aguil
a
r
m
ergetool
-
-lib:
specialize diff o
p
tions for
emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
D
a
v
i
d
Aguilar
mergetool--
l
ib: simp
l
ify API usage by removing more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
di
f
ftool/mergetool: refa
c
tor commands t
o
us
e
git
-
m
e
r
getool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
mergetool: us
e
$(
.
.
.
) i
n
stea
d
of
`
bac
k
ticks
`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bash
completio
n
: ad
d
git-dif
f
to
o
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid A
g
uila
r
d
ifftool
:
a
d
d suppo
r
t for a difftool
.
prompt config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
d
if
f
tool: ad
d
vari
o
us git-difftool
t
ests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vi
d
Aguil
a
r
d
ifftool: move
'g
i
t-dif
f
t
o
o
l
' out of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
di
f
ftool: add a
-y shortcut for
-
-
no-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
difft
o
o
l
: use perl built-ins when testing for msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
i
l
ar
d
iffto
o
l: remo
v
e the ba
c
kup
file
f
e
a
ture
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
difftool: r
e
move merge options for opendif
f
, tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
Da
v
id Aguilar
ev
e
ryd
a
y:
u
se t
h
e das
h
less
f
orm of
git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
co
n
t
rib/difftool
:
use a sepa
r
ate confi
g
n
ames
p
ace fo
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
Da
v
i
d
Aguilar
contr
i
b
/difftool: Don't rep
e
at merge
t
ool ca
n
didates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
D
avid Aguil
a
r
difftool: put
the
c
u
r
so
r
on
the editable file for Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
Da
v
id
Aguilar
difft
o
ol: fix d
o
cument
a
ti
o
n problems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David Aguilar
contrib: add
'git di
f
ft
o
ol' for launching common
m
e
rge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-mergeto
o
l: pro
p
erly
h
andle "git
m
erge
t
ool -- filename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
t
e
sts: add a testcase for "
g
it submodule sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David
A
guilar
g
i
t-sub
m
odul
e
: add "syn
c
" co
m
m
and
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
David
Agui
l
ar
git-submodule: replace du
p
licated c
o
d
e
with a module_list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Ag
u
ilar
[
PATCH]
g
itk
:
D
on't show local
c
hang
e
s
when we there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree