repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge tag 'post183-for-junio' of http://github.com/msysgit/git
2013-05-21
David Aguilar
ima
p
-send: e
l
i
m
inate HMAC deprecation wa
r
nings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David
A
guilar
c
a
che
.
h: elimi
n
a
te SHA-1 deprecati
o
n warnin
g
s on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Ag
u
ilar
Makefi
l
e: ad
d
support for
App
l
e CommonCr
y
pto facility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David Aguilar
Makefil
e
: fix
d
efault
regex s
e
ttings on Da
r
win
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David Aguilar
mergetoo
l
s
/
kdiff3:
d
o
n
ot us
e
--au
t
o when diffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David A
g
uilar
help
.
c
:
add a co
m
pat
i
b
i
lity comment
to cmd_version(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Davi
d
Aguila
r
contrib/mw-to-git/t/insta
l
l-wiki
.
s
h
:
use a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David
A
guilar
contrib/examples/git-remote
.
perl: use a lower
c
a
s
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguil
a
r
t
e
sts: use a lo
w
ercase
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Ag
u
ilar
git-svn:
u
se a lower
c
ase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uil
a
r
Doc
u
mentation/u
s
er-manual
.
txt: use a lowercase
"usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguila
r
templates/hooks--up
d
ate
.
sa
m
ple: us
e
a low
e
r
c
a
s
e
"usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
cont
r
ib/h
o
oks/setgitperms
.
p
e
r
l: use a lowerc
a
s
e "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Agui
l
ar
contr
i
b/examples: use a lowercase "usage:
"
stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
contrib/fast-
i
mport/import-zips
.
py: us
e
spaces inst
e
ad
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguil
a
r
c
o
n
trib/fast-import/import-zips
.
py
:
f
i
x
b
roke
n
error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
contrib/fas
t
-i
m
port
:
us
e
a lowerca
s
e "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
co
n
trib/creden
t
ial: u
s
e a
low
e
rca
s
e "usage
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
git
-
cvsim
p
ort: use a l
o
wercase "usage:"
s
t
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
git-cv
s
im
p
o
rt: u
s
e a lowercase "usa
g
e
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
git-cvsexportcommit: use a lowercase "
u
s
ag
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
g
i
t-
a
rchimport: use a
lowercase "usage:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vi
d
Aguilar
git-merge-one-file: use
a
l
ow
e
rcase "usage:"
str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
u
ilar
git-
r
elink: use a lowercase "usage:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-svn: use
a low
e
r
c
as
e
"
u
s
age:" s
t
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-sh-setup:
u
se a
l
o
werc
a
se "usa
g
e:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
D
avi
d
Aguilar
t7
8
00: "defaul
t
s" is
n
o
longer a built
i
n t
o
o
l
n
a
me
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David
Aguilar
t7800:
modernize
t
ests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
D
a
v
i
d Ag
u
ilar
t7800: up
d
a
t
e copyrig
h
t notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Aguilar
d
if
f
t
oo
l
: silence uninit
i
alized vari
a
b
l
e warni
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
D
a
vid
A
guilar
p4merge: fi
x
prin
t
f
u
sa
g
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
difftool--helper: fix printf
u
sage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
d
o
c: ge
n
er
a
te a
li
s
t of valid merge tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David
A
guilar
mergetool--lib
:
add functions for finding available
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetool--
l
ib
:
impr
o
ve the help
text in gue
s
s
_
merg
e
_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David
Agu
i
l
ar
merg
e
tool-
-
l
i
b: si
m
plify command
expression
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Ag
u
i
l
ar
mergetoo
l
s: simplify how w
e
handle
"
vim" and "def
a
u
l
ts"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
avid Aguil
a
r
merg
e
to
o
l-
-
lib: improve show_
t
ool_h
e
l
p
(
) ou
t
put
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
Davi
d
Aguilar
mergetools
/
vim:
remove redundant
d
iff command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
Dav
i
d Aguilar
mergetools/
p
4merge: Honor $TMPDIR
for the
/
dev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David Aguila
r
mergetools/p4merge:
Handl
e
"/dev/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
D
a
v
id Agui
l
ar
mergetool-
-
lib: All
o
w custom
c
ommands to override built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Da
v
i
d Aguilar
g
i
tk: Ren
a
me 'ta
g
contents' to 'ca
c
h
e
d_
t
agcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Davi
d
Aguilar
gitk: Teach "Re
r
e
a
d r
e
fer
e
nces" to reload tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David
A
gu
i
lar
mergetool,di
f
ftool: Document --to
o
l-help consistently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Agui
l
ar
difft
o
ol: Disable --symlinks on
c
y
gwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Agu
i
l
a
r
d
ifftool: Handle
compare
(
) returning
-
1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
dif
f
tool: Wrap long lines for readabilit
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David
A
guilar
diffto
o
l: Chec
k
all
r
eturn codes
from compare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Da
v
id Aguilar
d
i
fftool
:
Handle findi
n
g
m
ergetools/ in a path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
avid Aguila
r
difftool:
U
se symlinks
whe
n
diffing against th
e
w
o
r
ktre
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguilar
difftoo
l
: Call the
t
emp directory "gi
t
-difftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d Aguilar
di
f
ftool: Move opt
i
on
values
into
a
hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Eliminate global vari
a
bles
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguilar
difftoo
l
:
S
i
mplify
p
rint_tool_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David A
g
uilar
t7800: Test difftool
passi
n
g arguments
to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David A
g
uilar
mergetool: Provid
e
an em
p
ty file when
nee
d
ed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
Makefile: I
m
prov
e
c
ompiler header depende
n
cy
c
heck
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetool
s
/meld: U
s
e '--ou
t
put' when
av
a
ilable
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguila
r
mer
g
e
tool-
-
lib: Refactor
t
ools
i
n
to separate files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id A
g
uilar
me
r
getool--lib: Make style consist
e
n
t with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid A
g
uilar
dif
f
tool--helper:
Make
s
tyle
c
onsi
s
tent with
g
i
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
Davi
d
A
guilar
t/t7503-pre-commit-hook
.
sh: A
d
d GIT_PREFIX
te
s
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
id Ag
u
ilar
git-
m
e
r
getool--lib: Mak
e
vimdi
f
f ret
a
i
n the
curren
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David
A
gui
l
ar
git:
R
emove han
d
ling f
o
r GIT
_
PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
s
etup: Prov
i
de
GI
T
_PREFIX t
o
buil
t
-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
submodule sy
n
c: Update "su
b
module
.
<name>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
Davi
d
Aguilar
mergeto
o
l
: Skip autoreso
l
ved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David Agui
l
a
r
Do
c
u
m
ent
a
tion: Explain g
i
t-mergetoo
l
's use of temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David Ag
u
il
a
r
Makefile: Remo
v
e usage o
f
d
e
precated Py
t
hon "has
_
key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
D
a
vid Aguilar
difftool:
Fix
'
-
-
gui' when diff
.
guito
o
l is unconfi
g
ure
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
D
avid Aguilar
t7800-difftool
.
sh: Test mergetool
.
prompt fall
b
ack
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David
A
guilar
difft
o
ol:
U
pdate copyrig
h
t no
t
i
c
e
s
to list each year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
Aguilar
di
f
ftool: Use eval to expand '--ext
c
md'
e
xpre
s
sions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d Aguil
a
r
difftool: Add
'
-x' and as
a
n
alias fo
r
'--
e
xtcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David A
g
uilar
t78
0
0-diff
t
oo
l
.
sh:
S
implify the
--extcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
git-
d
iff
.
t
x
t
:
Link to git-d
i
f
f
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
v
i
d Aguil
a
r
di
f
ftool: A
l
l
o
w sp
e
cifying u
n
configured comma
n
ds with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool--helpe
r
: Remove use of the
GIT
_
M
ERG
E
_T
O
OL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool--helper: Up
d
ate
co
p
y
right a
n
d
re
m
ove distracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
D
a
v
id
Aguilar
gi
t
-
d
ifftool: Add '--gui' for selecting a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David
Aguilar
t7800-dif
f
tool: Set a bogus tool
f
or use
b
y test
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Aguila
r
help: D
o
not unnec
e
ssa
r
ily
l
o
ok for
a
r
eposi
t
ory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
submodule
.
c:
S
quelch a
"u
s
e before assignment" warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
Agui
l
ar
di
f
f: generate pre
t
ty
filen
a
mes in p
r
ep_tem
p
_bl
o
b()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id
Agu
i
l
a
r
compat: add a b
a
se
n
ame() co
m
p
a
tibilit
y
function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
i
d Aguilar
c
ompa
t
: add a mkste
m
p
s() compatibility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Aguilar
Add git
-
r
e
place to
.
gitignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
Da
v
id Aguilar
merge
t
o
ol--lib: add supp
o
rt for araxis mer
g
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
Dav
i
d Aguilar
m
e
rgetool--lib: specialize dif
f
optio
n
s for emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
D
av
i
d Ag
u
ilar
m
e
rget
o
ol
-
-
l
ib
:
simplify API usa
g
e by remo
v
in
g
more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diff
t
ool/
m
ergeto
o
l: refactor c
o
m
m
ands
t
o
us
e
g
it-mergetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
mergetool
:
us
e
$(
.
.
.
) instead of `back
t
icks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
b
as
h
complet
i
on:
add
g
i
t-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
difftool: add suppor
t
for
a
diffto
o
l
.
prompt conf
i
g
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
difftool: add
various git-diffto
o
l tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguil
a
r
diffto
o
l: move 'git-difftoo
l
'
out of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool:
add a -
y
shortcut for --no-pro
m
pt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
ifftool:
use p
e
rl
built-ins
whe
n
testing for
msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Ag
u
ilar
difftool: remove the backu
p
fil
e
featur
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next