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
t7610-mergetool: add missing && and remove commented-out code
2014-10-15
David A
g
uil
a
r
t7610-mergetool
:
add miss
i
ng && a
n
d rem
o
ve commented
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
D
a
vid Aguilar
t
7610-
m
e
r
g
etool: use tabs inste
a
d of a mix of
tabs
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-02-24
David Ag
u
ilar
difftool: support
r
epositories wit
h
.
gi
t
-file
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-01-16
Davi
d
Aguilar
p
u
ll: add --ff-only to
the help text
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-01-16
David Ag
u
ilar
pull: add
p
ull
.
ff configurat
i
on
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-21
David Aguilar
imap
-
s
e
nd: e
l
i
m
i
nate H
M
AC depr
e
c
ation warn
i
ngs on
M
ac
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
cache
.
h: eliminate
S
H
A-1 deprecation warnings
on Mac
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
Davi
d
Ag
u
ilar
Makefi
l
e
: add suppo
r
t for
A
pple CommonCrypto facil
i
ty
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-11
David Agu
i
lar
Make
f
ile: fix default re
g
ex settings on Darwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-09
David Aguilar
mergetools/kdiff3: do not use --auto wh
e
n diffing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-04-16
Dav
i
d Aguilar
help
.
c: add
a
co
m
patibi
l
ity
comment to cmd_v
e
r
sion()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David
A
g
u
ilar
con
t
r
ib
/
mw-to-git/t/install-
w
iki
.
sh: use
a low
e
r
case
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David A
g
uilar
contrib/exam
p
l
e
s
/
git-remote
.
perl: use a lowercase
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vi
d
A
gu
i
lar
test
s
: use a
l
ow
e
rca
s
e "usage
:
"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id A
g
uilar
git-svn
:
us
e
a lowercase "us
a
ge:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
Do
c
umentati
o
n/us
e
r
-
manual
.
txt
:
u
s
e a lowerc
a
se
"
usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Agu
i
lar
templates/hooks--updat
e
.
sam
p
le:
us
e
a
lowercase "usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/h
o
oks/setg
i
tperms
.
perl:
u
se a low
e
rcase "
u
sage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contr
i
b
/
exa
m
ple
s
: u
s
e a lowercase "usage:" str
i
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/fast-i
m
port/import
-
zi
p
s
.
p
y
: use spaces instead
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid
A
guilar
contrib/fas
t
-import/imp
o
rt-zips
.
py: fix
b
roken e
r
r
o
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/fast-import: use a lowercase "usage:" stri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
contrib/credential:
u
s
e
a
l
owercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
git-c
v
s
import: use a
l
owercase
"
usage:" s
t
r
in
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
git-cvsimport: use a lowe
r
case "usa
g
e:"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
git-
c
vsexportcommit:
use a
l
owe
r
ca
s
e "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-arc
h
import:
use a lowercase "usag
e
:
" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
ui
l
ar
git-merge-one-fi
l
e: u
s
e a low
e
rcase "u
s
a
ge:" str
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
g
i
t-relink: use a low
e
rcase "usage:"
s
tring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-svn: use a lo
w
ercase
"
usage:
"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-sh-s
e
tup: use a lowerc
a
se "usage:" s
t
ring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t780
0
: "d
e
faults" is no lo
n
ger a
b
uiltin to
o
l nam
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t7800:
m
o
d
erniz
e
te
s
ts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-20
D
avid
Aguilar
t7800:
update
c
opyright notice
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-17
David Agui
l
ar
difftool: silenc
e
un
i
nitial
i
z
e
d
vari
a
ble warnin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
D
avid Aguil
a
r
p4m
e
rge: fix printf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
Da
v
id Aguilar
diffto
o
l--hel
p
er:
f
i
x
printf
u
sage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David
Aguila
r
doc: gen
e
r
a
te a list of
v
a
l
i
d merge tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
Da
v
id Aguilar
mergeto
o
l
-
-lib: add
funct
i
o
ns
f
o
r
finding available
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguil
a
r
mergetool--lib: improve the help
te
x
t in guess_merge_to
o
l
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetoo
l
--lib
:
simplify
command express
i
ons
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mer
g
etools
:
simplify ho
w
we handle "vim" and "defaults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
D
a
vid Agui
l
ar
mergetool--l
i
b: im
p
rove show_tool_help() outpu
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
Da
v
id A
g
ui
l
ar
mergetoo
l
s/vi
m
:
remove redunda
n
t
d
iff comman
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
David Agu
i
lar
merge
t
ools
/
p4mer
g
e
:
H
onor $TMPDI
R
for the /dev/
n
ull
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
David Aguila
r
mergetoo
l
s/p4merge: Handle "/dev/null"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
m
e
r
geto
o
l--lib: Al
l
o
w cus
t
om commands to overr
i
de built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
D
a
v
i
d Ag
u
ilar
g
i
tk: Rename 'tagconte
n
ts' to 'c
a
ched_ta
g
conten
t
'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Agu
i
lar
gitk:
Teach "
R
eread reference
s
" to
reload tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
merg
e
tool,
d
ifftool: Docu
m
ent --
t
ool-help consistently
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David
A
guilar
d
ifftool: Disable --symli
n
ks
o
n
c
ygwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
d
iff
t
ool: Handle compare(
)
r
eturning
-
1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
dif
f
to
o
l: Wrap
l
ong li
n
es fo
r
readabi
l
it
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftool: Check a
l
l r
e
turn co
d
es from compare()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David
A
guilar
dif
f
tool: Handle
fin
d
ing merge
t
o
o
ls/ in a
pa
t
h with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
i
ffto
o
l: Use sym
l
inks when diffi
n
g ag
a
inst
t
h
e wo
r
k
t
ree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
i
f
fto
o
l: Call the
t
e
mp dir
e
ctory "git-dif
f
tool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Ag
u
il
a
r
di
f
f
t
ool: Move option va
l
ues into a ha
s
h
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
Aguilar
difftool: Eliminate global v
a
riables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difft
o
o
l:
S
implify print_tool_help
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
D
a
v
id
Aguilar
t
7
8
00: Te
s
t difftool
p
assing
arguments to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David Aguila
r
mergetool: Provide
an em
p
ty file when needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David A
g
uilar
Makefile: Impro
v
e compi
l
er
he
a
der
d
e
pen
d
ency c
h
e
c
k
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d
Aguilar
mergetools/meld
:
U
s
e '--
o
ut
p
u
t' wh
e
n avai
l
abl
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
m
e
rgeto
o
l--
l
ib: Refactor tools into separate fi
l
es
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Aguilar
mergetool--lib: Make style
c
onsis
t
ent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid A
g
u
ilar
difftool--helper: Make style consis
t
ent with
g
i
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Ag
u
ilar
t/t7503-pre-commit-hook
.
sh: Add GIT_PR
E
FIX
tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David
A
guilar
git-mergetool--
l
ib:
M
ake vimdiff retain
t
he
c
urrent
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David A
g
uila
r
gi
t
: Remove h
a
ndling for GIT_PREFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David
A
guilar
setup: Provide GIT_PREFI
X
to built-
i
ns
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
D
avid Aguilar
submo
d
ule sync: Update "submodule
.
<n
a
me>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
D
avid Ag
u
ilar
mergetool:
Skip autoreso
l
ved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
D
a
vid
Aguilar
Documenta
t
ion: Expl
a
i
n
g
i
t-mergetool's us
e
of
t
emporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David
Aguilar
Makefile: Remov
e
usage of deprecat
e
d Pytho
n
"has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
D
avid A
g
uilar
difftool:
Fix '
-
-gui
'
when diff
.
guitoo
l
is
u
nconfi
g
u
r
ed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
Da
v
i
d Agu
i
lar
t7800-dif
f
t
ool
.
sh:
T
est
mergetool
.
prompt fa
l
lback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
D
a
vid Agui
l
a
r
difftool: Update copyright notices
t
o
lis
t
each
year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
d
i
f
ftool: Use eval to expand '--extc
m
d' express
i
ons
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d
A
guil
a
r
difftool: Ad
d
'
-x' a
n
d
a
s an alias for '-
-
extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid Aguilar
t780
0
-difftool
.
sh: Simplify the --extcm
d
t
e
st
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
git-diff
.
txt: Lin
k
t
o
gi
t
-di
f
ftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
diffto
o
l: All
o
w spec
i
fying unconfigured c
o
mm
a
nds with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d
Aguilar
difft
o
ol--helper: Remove
u
s
e of th
e
GIT_MERG
E
_T
O
OL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool--hel
p
er:
U
pdate c
o
pyright and remove distract
i
ng
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David
A
guilar
gi
t
-
d
ifft
o
o
l: A
d
d '--gui
'
for selecting a GU
I
to
o
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
D
avid Aguilar
t7800-difftool: Set a
b
o
g
us tool for
u
s
e
by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
Da
v
id Aguil
a
r
help: Do not u
n
necessarily look for
a re
p
osi
t
ory
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David
Aguilar
submodule
.
c: Squ
e
lch a "us
e
before assignment" wa
r
ning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
A
guil
a
r
diff: generate p
r
e
t
ty
f
ilenames in pr
e
p_temp_
b
l
o
b(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguila
r
c
o
mp
a
t
:
add a basena
m
e(
)
compatibility function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: add a mkst
e
mps
(
)
c
ompatibility func
t
ion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Ag
u
ilar
A
dd
g
it-replace to
.
gitignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
Dav
i
d Aguilar
merg
e
tool--lib: add
su
p
p
ort f
o
r araxis
m
erge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
D
avi
d
Aguilar
m
ergeto
o
l
-
-
l
ib: specialize
diff optio
n
s for em
e
rge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
mergetool--lib: simpl
i
f
y
API u
s
ag
e
by
removi
n
g mo
r
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
diff
t
ool/mergetoo
l
: refactor c
o
mm
a
nds
to use
git-mergetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
me
r
getool: use $(
.
.
.
) instead o
f
`backticks
`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
b
ash c
o
mple
t
ion: add g
i
t-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid A
g
uilar
d
i
fftool:
a
dd support for a diff
t
ool
.
prompt config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
next