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
Updated the usage string of git reset
2010-03-28
David Aguilar
dif
f
tool: Fi
x
'--gui' when
diff
.
guitool is unconfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Ag
u
i
l
ar
t7800-
d
i
fftool
.
sh: Test merge
t
ool
.
prompt fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David
Aguilar
diffto
o
l: Up
d
ate
c
o
p
yright notices to list eac
h
y
e
ar
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d Aguil
a
r
d
i
fftool: Use eval t
o
e
x
p
a
nd
'--extcmd' expre
s
sions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d A
g
uil
a
r
di
f
ftool: Add '-
x
' and as an
a
lias for '--ext
c
md
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David
Aguilar
t7800-difft
o
ol
.
s
h
: Simplify the --extcmd
t
es
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
A
guilar
git-diff
.
txt: Link to git-difft
o
ol
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
A
g
uila
r
dif
f
tool: All
o
w specifying unc
o
nfig
u
red co
m
mands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguila
r
d
iff
t
o
o
l--
h
e
l
per: Remove use
of the GIT_MERGE
_
TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
Aguilar
difftool-
-
hel
p
e
r: Update co
p
yright and
r
e
move d
i
stracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguil
a
r
git-dif
f
tool: Add
'-
-
gui
'
for
s
electing
a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t7800-difft
o
ol
:
Set a bogus tool fo
r
use
by test
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
Dav
i
d A
g
uilar
h
elp:
Do not un
n
eces
s
arily look
for
a
reposit
o
ry
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Ag
u
ilar
s
u
bmodule
.
c:
S
quelch a "u
s
e
b
efor
e
assignm
e
n
t
" warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Aguilar
d
i
ff: g
e
ner
a
te pretty
f
il
e
n
ames in prep_t
e
mp_bl
o
b()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat:
add a
bas
e
name()
co
m
patibilit
y
functio
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Agui
l
ar
com
p
at: add a
mkstemps() compatibi
l
ity function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
avid
A
guil
a
r
Add git-repl
a
ce to
.
git
i
g
n
ore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Agu
i
lar
m
er
g
etool--lib: a
d
d suppo
r
t for ara
x
i
s
me
r
ge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
D
avid Aguilar
m
e
r
g
etool--li
b
:
special
i
z
e
dif
f
options for emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David
A
guilar
mergetool--lib: simpli
f
y
A
PI usa
g
e
by removing more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
difftool
/
m
e
rgetool: refactor c
o
mmands to use git-mergetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
mer
g
etool: use
$(
.
.
.
)
i
nstead of `backti
c
ks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguil
a
r
bash completion: add git-di
f
ftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Ag
u
il
a
r
difftool: ad
d
suppor
t
for a d
i
fftool
.
p
rompt
c
o
n
fig
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
d
ifftool:
ad
d
vari
o
u
s gi
t
-diffto
o
l
test
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
d
i
fftool
:
mo
v
e 'git-difftool' out
o
f contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
difft
o
ol: add a
-y shortcut for -
-
no-p
r
ompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Ag
u
i
l
a
r
difftoo
l
:
u
se perl built-ins when testing for m
s
ys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: re
m
ove the backu
p
file
f
eature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
diff
t
o
ol: remo
v
e me
r
ge options
f
or opendiff, tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
Davi
d
Agu
i
lar
everyda
y
: u
s
e the dash
l
ess form
o
f git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David Agui
l
ar
c
o
n
t
rib/difft
o
o
l
: us
e
a separate
c
onfi
g
nam
e
s
p
ace for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
D
a
v
id Aguil
a
r
contri
b
/
difftool: Don't repeat merge tool can
d
idate
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David
A
guilar
difft
o
ol: p
u
t
t
he c
u
r
s
or
on
t
he edita
b
le file for V
i
m
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David
Agu
i
lar
difftool: fix do
c
umen
t
atio
n
problem
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David
A
guil
a
r
contrib: add
'
git di
f
fto
o
l' for lau
n
c
hing co
m
mon merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David Ag
u
il
a
r
git-mergetool: prope
r
ly h
a
ndle "gi
t
mergetool --
f
ilename
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David Aguila
r
tests
:
a
dd
a testcase
f
or "git submodule sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David Aguilar
g
it-submodule: add "s
y
nc" command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
git-su
b
module
:
repl
a
ce duplicated
c
o
de with
a module_list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
Dav
i
d Aguilar
[
P
ATCH] gitk: Don't show local c
h
ang
e
s when we there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree