repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Start preparing for 1.9.1
2014-02-24
D
a
vid Aguilar
difftoo
l
: support repositories
with
.
git-f
i
les
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
Dav
i
d Agui
l
ar
i
m
ap-send: eliminate HMAC deprecation warnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David
A
gui
l
ar
cache
.
h: e
l
im
i
nate SHA-1 d
e
precation warnings
on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
Makefile: add
sup
p
ort for A
p
ple C
o
mm
o
nCrypto fac
i
l
i
ty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
Dav
i
d Agui
l
ar
Makefile:
f
ix default
r
egex
settings on Darwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David Aguilar
mergetools/kd
i
ff3: do not
use --auto wh
e
n diffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David
A
guil
a
r
he
l
p
.
c: add a comp
a
tibility com
m
ent to
c
md_version()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid Aguilar
contri
b
/mw-to
-
gi
t
/t/install-wiki
.
sh:
u
s
e
a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
avid
Aguilar
contrib/examples/git-remote
.
per
l
:
use a
l
owerc
a
se
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid Ag
u
ilar
t
ests
:
use a l
o
w
e
rcase "usa
g
e:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David
A
guilar
git-
s
vn: use a low
e
rcase
"
usage:"
s
tr
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
Documentation/user-manual
.
t
x
t: use a l
o
wer
c
ase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
templates/hooks
-
-u
p
date
.
sample
:
use a lower
c
ase
"
usag
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/h
o
oks/setgit
p
erm
s
.
perl
:
use a lowe
r
case
"usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
con
t
rib/examples:
u
s
e a lowercase "usage:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
c
o
ntrib/fast-import/imp
o
rt-zip
s
.
py: use spaces in
s
tead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
contrib/fast-import
/
i
m
port-zips
.
py: f
i
x br
o
ken
e
r
r
o
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/
f
a
s
t-
i
m
p
o
rt
:
use a lowercase
"
usage:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguila
r
con
t
rib/credential: use a
lo
w
ercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id
A
gui
l
ar
git-
c
vs
i
m
p
o
rt: use
a lowerca
s
e
"
u
s
age:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
git-cvsimpor
t
: use
a
lo
w
er
c
ase "usage:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
git-cvsexportcommit: use a lo
w
e
rc
a
se "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
git-a
r
chimport: use a low
e
rca
s
e "usage
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
git-mer
g
e-one-file: use a lowercas
e
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
g
i
t-relink:
u
s
e a
lowercase
"
u
s
age:" str
i
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid
Aguilar
g
i
t-svn: us
e
a lo
w
erc
a
se "usage:" s
t
ri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
git-sh-setup: u
s
e a lowerca
s
e
"usage
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David
A
guilar
t7800
:
"d
e
faults" is no longer a builtin tool n
a
me
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguil
a
r
t78
0
0: modernize
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
D
a
vid Ag
u
ilar
t7800:
update
c
opyrig
h
t notic
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Ag
u
il
a
r
difftool: silence uni
n
itialized vari
a
b
le
w
arning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Ag
u
ilar
p4merge: fix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
diff
t
oo
l
--helper: fi
x
printf
u
sage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguila
r
doc: genera
t
e
a
l
ist of valid merge tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
mergetool-
-
lib: add functio
n
s f
o
r finding avail
a
ble
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Ag
u
ila
r
mergetool--
l
i
b
: improve
the help
t
ext in gues
s
_mer
g
e_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mer
g
eto
o
l--lib: simplify com
m
a
nd
e
xpr
e
s
s
io
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
merget
o
ols: sim
p
lify ho
w
we
ha
n
dle "vim" and
"defaults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
m
e
rgetool--lib: improve sh
o
w_tool_help() output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
mergeto
o
ls/vim: re
m
ove redundant diff command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
David Aguilar
me
r
g
etools/p4merge: Honor $TMPDIR for th
e
/
dev/nul
l
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
Davi
d
A
g
uilar
mergetools/p4m
e
rge
:
Handle "/dev/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
mergetoo
l
--lib: Al
l
ow custom c
o
mma
n
ds to
override built-i
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
a
vi
d
A
guila
r
gitk: Rename 'tagconte
n
ts' to '
c
ached_ta
g
content'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Teach "Reread refe
r
ences" to re
l
o
a
d tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David Agui
l
ar
mergetoo
l
,difftool:
D
ocument --tool-
h
elp consist
e
ntly
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
d
i
ffto
o
l: Dis
a
bl
e
--symlinks on
cyg
w
in
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Dav
i
d Aguilar
difftool: Handle co
m
p
a
re() returning -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftoo
l
: Wrap long li
n
es for rea
d
ability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
avid Aguilar
difftool
:
Check all return codes
from compare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Ag
u
ilar
difftool:
Handle finding mergetools/ in a path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
A
guila
r
diff
t
ool: Use s
y
m
links
w
hen diffin
g
agai
n
st
t
h
e
w
o
r
ktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
v
id Aguilar
diff
t
ool: Call the temp dire
c
tory "git-diff
t
ool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
Aguilar
difftool: Move option values into a h
a
s
h
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Agu
i
lar
difftool: Eliminat
e
global
var
i
abl
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Aguilar
difftool:
Simplify prin
t
_tool_
h
elp()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David
Aguilar
t
7
800: Test difftool pa
s
sing arguments to d
i
ff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
Dav
i
d Aguilar
merget
o
ol:
P
rovide an
empty file
w
h
e
n
n
e
e
ded
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David Agu
i
lar
Makefile: Improve
c
ompiler header dep
e
ndency che
c
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Aguilar
merge
t
oo
l
s/meld: Use '--
o
utput' when available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetool--lib: Refacto
r
t
o
ols i
n
to se
p
arate f
i
l
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetool-
-
lib:
M
a
k
e
style consisten
t
with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d Aguilar
d
ifftool--helper: Make style consistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t/
t
7503-pre-commit-hook
.
sh
:
Add GIT
_
PREFIX t
e
sts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Agui
l
ar
gi
t
-
m
erget
o
ol--lib
:
Make vimdiff retain the current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Ag
u
ilar
git: Remove ha
n
dling for GIT_PRE
F
I
X
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
a
vid Aguilar
setu
p
: P
r
ovide GIT_PREFIX to built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Ag
u
ilar
s
ubmodule
sync: Upda
t
e
"
submodule
.
<name>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
mer
g
et
o
ol: Skip autoresol
v
ed pa
t
hs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David
A
gui
l
ar
Doc
u
me
n
tat
i
on
:
Ex
p
l
a
i
n git-m
e
rget
o
ol's u
s
e of temporar
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David Aguila
r
M
a
kefile: Remove usage of deprecated Py
t
hon "has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
difftool: Fix '--gui' w
h
en diff
.
guitool is un
c
onfigur
e
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David
Aguila
r
t7800
-
diff
t
oo
l
.
sh
:
T
est mer
g
etool
.
prompt fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
dif
f
tool:
Update
copyright not
i
ces to list each y
e
ar
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d Aguilar
difftool: Use eval to expand
'
--ext
c
md'
expressi
o
ns
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David A
g
u
i
lar
difftool: Add
'-x
'
and as an alias for
'
-
-ex
t
cm
d
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t
7
800
-
difftool
.
sh:
Simplif
y
the --extcmd
test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
Ag
u
ilar
git-dif
f
.
txt: Link
t
o g
i
t
-
difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
A
guilar
d
i
fftool: Al
l
ow specifying unconfigure
d
com
m
a
n
ds with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftoo
l
--h
e
lper: Remove
us
e
o
f
the GIT_
M
ERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Aguilar
diff
t
ool--hel
p
er:
Up
d
a
te cop
y
right a
n
d
remove distract
i
ng
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Agu
i
la
r
git-dif
f
tool: Ad
d
'--gui' for selecting a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t7800-difftool: Set
a
b
ogus tool for
u
s
e
by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Ag
u
ilar
h
e
lp: Do not unnec
e
s
sar
i
l
y look fo
r
a reposit
o
r
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
su
b
module
.
c: Squelch a "use before assignment
"
warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
diff
:
generate pretty filenames in prep
_
t
e
mp_b
l
o
b
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Agui
l
ar
compat: add a
b
asena
m
e()
c
ompa
t
ibility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
Ag
u
ilar
co
m
pat
:
add
a mkstemps()
c
ompatibili
t
y f
u
nction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
Aguila
r
Ad
d
git-
r
eplac
e
to
.
gitignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
mergetool
-
-lib:
a
dd su
p
port for
a
r
a
xis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David
A
guilar
mergetool--lib: specialize diff opt
i
ons
for emer
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
merget
o
ol--li
b
:
s
im
p
lify API
usage
b
y
removing
more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
ifft
o
ol/mergetoo
l
: r
e
fa
c
t
o
r com
m
ands to use git-merge
t
ool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
me
r
getool:
u
se $(
.
.
.
)
instead of
`
back
t
icks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
b
as
h
c
omple
t
ion: a
d
d
g
it-diffto
o
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
d
i
fftool
:
a
d
d support for
a
diff
t
ool
.
p
rompt c
o
nfig
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
i
d
A
g
uil
a
r
difftool: a
d
d va
r
i
o
us git-difftool
t
e
s
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
difftool: m
o
v
e
'git
-
dif
f
to
o
l' o
u
t of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
diff
t
o
ol:
a
dd a
-
y shortcut
f
or --no-pr
o
m
pt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
difftool: use
perl built-ins when te
s
ting for
msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next