repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
MSVC: link in invalidcontinue.obj for better POSIX compatibility
2014-02-24
David Aguila
r
difftool:
s
upport rep
o
sito
r
ies with
.
git-files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
David Agu
i
lar
imap-send:
e
liminate HMAC depreca
t
ion warnings on
Ma
c
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David
Aguilar
cache
.
h:
e
limi
n
ate SHA-1
d
e
p
r
ec
a
tion warnings on M
a
c
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David
A
gu
i
lar
Makefile: add su
p
po
r
t for Appl
e
Com
m
onCrypto facility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
D
a
vid
Aguilar
Makefile:
f
ix
d
efault regex setting
s
on Darwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David Aguilar
merge
t
ools/k
d
iff3:
do not use --au
t
o
w
hen d
i
ffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David Ag
u
ilar
help
.
c: add a compatibility
comment
t
o cmd
_
v
e
rsion()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id Aguilar
con
t
rib/mw-to-git/t/insta
l
l-wiki
.
sh: u
s
e a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
avid Agu
i
l
ar
c
ontrib/e
x
amples/git-remo
t
e
.
perl:
use a l
o
wercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Davi
d
Aguilar
tests
:
use a lowe
r
c
a
se "
u
sag
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Davi
d
Aguilar
git-svn: use a lowe
r
c
a
s
e
"usage:"
s
t
r
i
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
D
o
cumentation
/
user-manual
.
txt: use a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
i
d Aguilar
t
e
mplat
e
s/h
o
oks
-
-update
.
sample: us
e
a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
id Aguila
r
contrib/hooks/setgitperms
.
p
e
rl
:
use
a lowercase
"
u
sage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
contrib/examples: u
s
e a lowerc
a
se
"usage:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Ag
u
ilar
con
t
rib/
f
ast-import/
i
mport-zips
.
py:
use spaces ins
t
ead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/fast-imp
o
rt/import-z
i
ps
.
py: fix
broken er
r
o
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contri
b
/fa
s
t-import: use a lower
c
ase "
u
s
a
g
e:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d
Agu
i
lar
con
t
rib
/
cre
d
ential: u
s
e a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
git-cvsimport: us
e
a
lowerc
a
se "
u
sag
e
:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
i
l
ar
git-cvs
i
mport: use a lowe
r
case "usa
g
e:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Agui
l
ar
g
i
t-cvsexportcom
m
i
t: us
e
a low
e
rcase "usag
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
git-archimport: u
s
e a low
e
r
c
ase
"
us
a
g
e:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-merge-one-f
i
l
e
: u
s
e a
lowerc
a
se "
u
s
age:"
s
tr
i
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
gi
t
-
r
e
link
:
use a l
o
wercase "usage:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Agui
l
ar
git-sv
n
: u
s
e a l
o
wercase "usa
g
e:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Agui
l
ar
git-sh-setup: use a lowercase "usage:"
s
tri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David
Aguilar
t
7800:
"
defaults
"
is no longer a
b
u
i
ltin tool
name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t7800: mode
r
n
i
z
e tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
D
a
vi
d
Aguilar
t
7800: update copyrig
h
t notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Agui
l
a
r
difftool: sil
e
n
c
e uni
n
i
tializ
e
d vari
a
ble warn
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David
A
g
u
i
lar
p4m
e
rge: fix print
f
usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
D
avid A
g
uilar
di
f
ftool-
-
helper:
f
ix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Agu
i
lar
doc: generate a
list o
f
v
al
i
d merge tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
m
ergeto
o
l--li
b
: ad
d
functions for find
i
ng available
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David
A
guilar
mergetool--lib: improve the help
text in g
u
es
s
_m
e
rge_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Dav
i
d Ag
u
ilar
m
e
rgetool--lib: s
i
mplify command expression
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetools: simpli
f
y how we h
a
ndle "vim"
a
nd "d
e
f
a
u
lts"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
avid Aguilar
mergetool-
-
li
b
:
i
mpro
v
e show_to
o
l_help() outpu
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Ag
u
ila
r
mergetools
/
v
i
m
: rem
o
ve redundant diff command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
D
a
v
id
A
gu
i
l
a
r
mergetools/p4
m
erge: Ho
n
or $TMPDIR
f
or the /dev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
D
a
v
id Ag
u
ilar
merg
e
t
o
ols/p
4
merg
e
:
Handle "/dev/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
D
a
v
i
d Aguilar
m
e
r
g
etool--lib: Allow custom commands to override b
u
ilt-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Ag
u
ila
r
gitk: Rena
m
e 'ta
g
cont
e
nts' to 'cached_tagcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Teach
"
Re
r
e
ad
r
efere
n
ces" to reload tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
mergetool,difftoo
l
: Document -
-
t
ool-help c
o
n
s
is
t
ently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
avid Aguilar
diff
t
ool:
Disable --s
y
mlinks on
c
ygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: Handl
e
compare()
r
eturning -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Agu
i
lar
d
i
f
f
tool: Wrap long lin
e
s fo
r
rea
d
ability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Dav
i
d Aguilar
d
i
fftool:
Che
c
k
all r
e
turn
code
s
from
compa
r
e()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Dav
i
d Aguil
a
r
difftool: Handle f
i
nding mergetools/ in a
path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
avid Aguilar
difftool: Use symlinks
when diff
i
ng aga
i
nst the
work
t
ree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Agu
i
lar
diffto
o
l
:
Call the
tem
p
dir
e
ctory "git-difftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool:
M
o
ve o
p
tion val
u
e
s
i
nto a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
uil
a
r
difftool: E
l
i
min
a
te global variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Ag
u
i
l
ar
difft
o
ol: Sim
p
lify print_too
l
_
h
elp()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
D
a
vid Agui
l
ar
t7800: Te
s
t difftoo
l
pass
i
n
g
arguments to dif
f
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David
A
guilar
mer
g
etool:
P
rovide an empty f
i
le
w
hen needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
Davi
d
Aguilar
Mak
e
fil
e
: Improve compiler h
e
ader de
p
endency
check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
Aguilar
merget
o
ols/meld
:
Use '--output' wh
e
n
a
va
i
lable
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetool--
l
ib: Re
f
actor to
o
ls into
s
epar
a
te files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d Aguil
a
r
mergetool--li
b
: Make
s
tyle consist
e
nt with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid Aguilar
difftool--
h
elper: Make s
t
yl
e
consi
s
tent wit
h
g
it
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
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
Dav
i
d
A
guilar
git-mergetool--lib: Make vimdiff retain th
e
current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David
Aguila
r
git: Remove
handlin
g
for GIT
_
PREFI
X
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
a
v
id
Aguilar
setup: Provide
G
IT_PREFI
X
to bu
i
lt-i
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David
Aguila
r
submodule
s
ync: Up
d
ate "
s
u
b
module
.
<name
>
.
u
rl"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
Da
v
id Aguilar
mergetool: Skip aut
o
resolved pat
h
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
Doc
u
m
entation
:
Explain git-merget
o
ol's use of tem
p
o
r
a
ry
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David A
g
uilar
Makefile: R
e
m
o
v
e usage
of
depreca
t
ed Py
t
hon "
h
a
s
_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
Da
v
id Aguilar
d
if
f
t
o
ol:
F
i
x
'-
-
g
u
i' w
h
en di
f
f
.
g
u
it
o
ol is un
c
onfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t7800-difftool
.
sh: Test mer
g
etoo
l
.
prompt fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David A
g
uilar
difftool: Update
copyright notices to
l
i
s
t
each year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Agui
l
ar
d
ifftool: Use eval
to ex
p
and '--ext
c
md' expressi
o
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
avi
d
Agu
i
lar
d
i
f
ftool: Add '-x'
and as
a
n
a
lias
f
or '--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Agui
l
ar
t78
0
0-difftool
.
sh: Simplify the --e
x
tcmd tes
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
git-diff
.
txt: Link
to g
i
t-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool: All
o
w specifying uncon
f
igured c
o
m
man
d
s with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
v
i
d
Aguil
a
r
difftool
-
-
hel
p
er: Remove use of the GIT_MERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool--
h
elper: Upda
t
e copyright
and
r
emove
d
is
t
racting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Ag
u
ilar
git-difft
o
ol: Add '--gu
i
' for sele
c
ti
n
g a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
D
a
v
id A
g
uilar
t7800-difftool: Set
a
bo
g
us tool for use b
y
tes
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
D
avid Aguilar
help
:
Do not unnecessarily look for
a
repo
s
itory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
su
b
mo
d
ule
.
c
: Squelc
h
a
"
use before assignment" warnin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
diff
:
g
e
nerat
e
pretty filenam
e
s in prep_temp_blob(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat:
ad
d
a basename() com
p
atibility f
u
nction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
avid A
g
uilar
compat: ad
d
a mkstemps() compatibility funct
i
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Add
g
it-re
p
lace
t
o
.
gitignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
D
a
v
i
d Aguilar
m
e
r
getool--lib:
ad
d
su
p
port for ar
a
xis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David Aguil
a
r
mergetool--lib: specialize diff
o
p
t
ions for emer
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Aguil
a
r
m
ergetool--
l
i
b: simpli
f
y
A
PI
usage by removing more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
d
i
fftool/me
r
g
e
tool
:
refact
o
r commands
t
o use gi
t
-mergetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
mer
g
etool: use $(
.
.
.
)
instead of `b
a
ckticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguila
r
bash completi
o
n: add git-di
f
fto
o
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
difftool:
a
dd support for a d
i
ffto
o
l
.
p
rompt
config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
fftool:
add various git
-
difftool tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
dif
f
tool: move 'git-d
i
f
f
to
o
l' out of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
diff
t
ool:
a
dd a -y sh
o
rt
c
ut for --n
o
-p
r
o
m
p
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool:
u
s
e
perl
b
uilt-ins when testing
fo
r
msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next