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
contrib/fast-import: use a lowercase "usage:" string
2013-02-24
David Aguilar
contrib
/
fast-im
p
ort:
use a lowercase "usag
e
:"
st
r
in
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/c
r
edential: use
a
lowercase "usage
:
"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Ag
u
ilar
git-cvsimport: use a lowercase
"
usage:" s
t
ri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cvsimpo
r
t: use a
lowercase "us
a
ge:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Agu
i
l
a
r
git-cvsex
p
o
r
tcommi
t
:
use a lowerca
s
e
"usage:
"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-archimport:
use a lo
w
ercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
git-merge-on
e
-f
i
le: use
a
lower
c
ase "usag
e
:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
l
a
r
git
-
r
e
link: us
e
a
lowercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
git-s
v
n
: use a lowercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
git-sh
-
s
e
tup: us
e
a l
o
wercase
"usage:
"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
p4m
e
rge:
f
i
x
p
r
intf
usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
Davi
d
Aguilar
d
ifftool--helper:
fix print
f
usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
doc: generate a list of
valid me
r
g
e tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
Davi
d
A
gu
i
l
a
r
mergetool-
-
l
i
b: add
func
t
ions for
findin
g
available
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
Davi
d
Aguilar
mergetool--lib: improve the help text in guess_merge_tool()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David
A
guila
r
merg
e
tool--lib
:
simpl
i
f
y c
o
mman
d
expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
D
avid
A
gu
i
lar
mergetools: simplify how
w
e handle "v
i
m" and "defaults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
m
ergeto
o
l
-
-li
b
: improve
s
how_t
o
ol_
h
elp() o
u
t
put
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Ag
u
ilar
mer
g
etools/
v
i
m:
r
emove redundant di
f
f com
m
a
n
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
David A
g
uila
r
mergetools/p4merge
:
H
onor $TMPDIR for the /dev
/
null
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
David Aguilar
me
r
g
e
tool
s
/p4merge: Handle
"
/
d
e
v/nul
l
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David Agui
l
ar
mergetoo
l
--
l
ib: A
l
lo
w
cust
o
m commands t
o
o
v
erride built-in
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
Davi
d
A
g
uilar
g
itk:
Rename
'
tag
c
ont
e
nts' to 'cached
_
tag
c
ontent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Te
a
c
h "Re
r
ead refe
r
ences" to relo
a
d tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
mergetool,difftool: Doc
u
m
ent --to
o
l
-
help consistentl
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Dav
i
d Aguilar
difftool: Disable --sy
m
links o
n
cygw
i
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Da
v
i
d
Agu
i
lar
difftool: Handl
e
compare() returning -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Dav
i
d Aguilar
difft
o
ol: Wrap long
l
ines
f
or
r
eadabili
t
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Ag
u
ilar
d
ifftoo
l
: Check all return code
s
fr
o
m compare()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
D
avid Aguilar
difftool: Handl
e
findin
g
merget
o
ols/ in a path with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Use symlinks
w
hen
d
i
ffi
n
g a
g
ainst the wor
k
tree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool:
C
all the temp direct
o
ry
"git-dif
f
too
l
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguil
a
r
difftool: Move
o
p
tion values
i
nto
a
h
ash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool:
Elimi
n
a
te global variables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguil
a
r
difftool: Simpl
i
fy
pr
i
nt_tool_he
l
p()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
D
a
vid Ag
u
ilar
t7800:
T
est difftool passing a
r
gu
m
e
n
ts t
o
dif
f
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
D
a
vid Ag
u
ilar
merge
t
o
o
l: Provide an emp
t
y fil
e
w
hen need
e
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
Makef
i
l
e
:
Imp
r
ove compi
l
er header dependen
c
y check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Agu
i
lar
mer
g
etools/meld:
U
s
e
'--output' whe
n
available
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mer
g
etool--lib: Refactor tools into sepa
r
at
e
file
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
A
guil
a
r
mergetoo
l
--lib: Make
s
t
y
le co
n
sistent with g
i
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
Aguilar
diff
t
ool--helper:
Make
s
tyle consistent w
i
th gi
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t/t7503
-
pre-c
o
mmit-
h
ook
.
sh: Add GIT_PRE
F
IX tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Davi
d
Agu
i
lar
git-mergetoo
l
--lib: Make vimdiff retain
the curr
e
nt
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David A
g
uilar
git: Remove hand
l
ing for
G
IT_PREFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguila
r
s
etup: Provi
d
e GIT_PR
E
F
IX to buil
t
-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David Agui
l
a
r
submodule sync: Update
"
submodul
e
.
<name>
.
u
rl"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David Aguila
r
m
ergetool:
S
kip autor
e
s
o
l
ved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
Docu
m
entat
i
o
n
: E
x
p
l
ai
n
g
i
t-m
e
rgetoo
l
's use
of
temporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
Makefile: Remo
v
e
usage of deprecated
Pyt
h
o
n
"
h
as_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
difftool: Fix '--gui' when diff
.
guitool is
u
nconfigured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Agui
l
ar
t
7800-difftool
.
sh: Test mergetool
.
prom
p
t fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
D
avid Aguilar
difftool: Up
d
ate cop
y
rig
h
t notices to list each
y
e
ar
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
D
avi
d
Agui
l
ar
d
i
ffto
o
l: Use eval to ex
p
and '-
-
extcmd' expressio
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
diffto
o
l: Add '-x'
a
nd as an alias for '-
-
extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David A
g
uilar
t7800-d
i
fftool
.
sh
:
S
implify th
e
-
-extcmd test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
g
it
-
diff
.
txt: Li
n
k to g
i
t
-
difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d Aguilar
difftool:
A
l
l
ow s
p
eci
f
ying
un
c
onfi
g
ured commands with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Aguilar
diff
t
ool--helper: R
e
move use of
t
he GIT_MERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Aguilar
diffto
o
l-
-
helper: Up
d
ate
copyright and remo
v
e distr
a
cti
n
g
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguil
a
r
git-di
f
ftool: Add '--gui' for selec
t
i
ng
a GUI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
Da
v
id Aguilar
t78
0
0-dif
f
tool: Set a
b
ogus t
o
ol for u
s
e b
y
t
est
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David
Agu
i
l
a
r
help
:
D
o n
o
t
un
n
ec
e
ssar
i
ly look
f
or a repository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
su
b
module
.
c: S
q
u
e
lch a
"use before assi
g
nme
n
t"
warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
avid
A
guilar
di
f
f:
g
enerate pr
e
tty
filena
m
e
s in prep_t
e
m
p
_blo
b
()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Agu
i
la
r
c
o
mpat: add
a basename()
compatibility
f
u
nct
i
o
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
comp
a
t: add a mk
s
t
e
m
p
s
(
) comp
a
ti
b
ility fun
c
tion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguil
a
r
Add git-replace to
.
gitignor
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
Da
v
id Aguilar
mer
g
etool-
-
lib:
a
dd suppor
t
for
a
raxis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David
A
g
u
ilar
mergetool--lib: speciali
z
e diff options
f
or emer
g
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
Da
v
id Agu
i
lar
merget
o
ol--lib: s
i
mplify API
usage by
r
emoving mor
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
difftool/m
e
rgetool: refactor
command
s
to use git
-
mergetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avi
d
A
g
uilar
mergetool: u
s
e $(
.
.
.
)
instea
d
of `backt
i
ck
s
`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
bash compl
e
ti
o
n: add gi
t
-diff
t
ool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: add
s
upport for a dif
f
tool
.
p
r
ompt config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool:
a
d
d va
r
ious
git-diff
t
ool tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: mov
e
'g
i
t
-
d
ifftool
'
out
of
c
o
ntrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid A
g
uilar
difftool: add
a -y shortcut for --no-pr
o
m
p
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Agui
l
a
r
dif
f
to
o
l: use p
e
rl built-i
n
s
when
testing for
m
sys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
ifftool: remove th
e
backup fi
l
e
f
e
ature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
fftool: remove mer
g
e options for opend
i
ff
,
tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
D
a
vid A
g
u
il
a
r
every
d
a
y
: use t
h
e da
s
hless form
of git-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David Ag
u
ilar
c
o
n
trib/di
f
ftool
:
use a separate con
f
i
g nam
e
s
pace for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David Aguila
r
contrib/diff
t
o
ol
:
Don't repeat merge tool cand
i
dates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difftool: put
t
he cur
s
or on t
h
e
e
d
i
t
a
ble file
f
or Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
Da
v
id Aguil
a
r
difftool
:
f
i
x d
o
cu
m
entation problem
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David Agu
i
lar
contrib:
add 'git dif
f
too
l
' for
l
aunchi
n
g
com
m
on
m
e
rge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
Dav
i
d A
g
u
ilar
git
-
mergetool: prope
r
ly han
d
l
e
"git mergeto
o
l --
filename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
tests: add a
t
estcase for "git submodu
l
e sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David Agui
l
ar
git
-
submod
u
le: add "sync" command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
git-submodule: rep
l
ace d
u
plicated cod
e
with a module_li
s
t
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
Da
v
id Aguil
a
r
[PATCH] gitk
:
Don't show local chan
g
es
when we the
r
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree