repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
diff: parse ws-error-highlight option more strictly
2014-11-14
Da
v
id Agu
i
lar
difftool:
h
onor
--trust-ex
i
t
-
code
for
builtin tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
David Aguilar
difftool: add support
f
or --trust-exit-
c
ode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
vid Aguilar
t7610
-
merge
t
ool: add test
cases for m
e
rgetool
.
writeToTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
v
i
d
Ag
u
ilar
mergetool: a
d
d an
o
ption fo
r
writing to
a
tempor
a
ry
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Agui
l
ar
merget
o
ol: use m
o
re conservative tempo
r
ary file
n
ames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
vid Aguilar
test-lib-functions: adj
u
st style to match Cod
i
ngGuidelin
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Ag
u
ilar
t7610
-
mergetool: use test_config to isol
a
te tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
id Aguil
a
r
mergetoo
l
s/meld:
m
ake usag
e
of `-
-
output` con
f
igura
b
le
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
av
i
d Aguil
a
r
g
it-s
h
-setup: move GIT_DIR
initia
l
ization
i
nt
o
a
f
u
n
cti
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Ag
u
ilar
mergetoo
l
: us
e
mo
r
e conser
v
ative temporary filen
a
m
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
id A
g
uilar
te
s
t
-
lib-f
u
nc
t
ions: adjust style to match C
o
d
i
n
g
Gui
d
elines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David A
g
u
i
lar
t7610-merget
o
ol: pre
f
e
r
test_config
over g
i
t
config
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Agui
l
ar
t761
0
-mergetool: ad
d
m
i
ssing
&
&
a
nd remove commented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d Agui
l
ar
t761
0
-merge
t
ool: use tab
s
i
n
ste
a
d o
f
a mix of
t
abs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
Da
v
i
d A
g
uilar
completion:
a
d
d -
-
s
h
ow-signature for lo
g
and show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
s
t
a
sh: prefer --quiet
o
ver
shell redirection of t
h
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
Davi
d
Aguilar
re
f
s:
m
ake rev-parse --
q
uie
t
actually
quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David Aguilar
t1503:
use test_mu
s
t
_be_empty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Ag
u
ilar
D
o
cumentati
o
n:
a
note about stdout
f
or git rev-parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
D
avid
A
g
uilar
cleanup
s
: ens
u
re tha
t
git-compat-util
.
h is included
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
David A
g
uilar
stylefi
x
: asterisks sti
c
k to the vari
a
ble, not the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
D
a
vid Aguilar
gitk
:
Catch mkdtemp errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
Da
v
id Aguilar
gitk:
U
se
m
k
t
em
p
-
d
to av
o
id p
r
ed
i
ctable t
e
mporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
Da
v
id Aguilar
gitk: Honor TMPD
I
R
when view
i
ng external
di
f
fs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David Ag
u
ilar
difftoo
l
: support repositories w
i
th
.
git-files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
Davi
d
A
g
uilar
pull: add --
f
f
-
onl
y
to the help text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
p
u
ll
:
add pull
.
ff confi
g
uration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
David Agu
i
lar
i
map-send:
e
lim
i
nate HMAC deprec
a
ti
o
n w
a
rnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
Davi
d
Agu
i
lar
cache
.
h
: elimin
a
t
e SHA-1 deprecat
i
o
n
war
n
ings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
Make
f
i
l
e: add support for App
l
e
CommonCry
p
t
o
f
acility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David A
g
uilar
Makefile:
f
i
x
default
regex settin
g
s on Da
r
win
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David Aguilar
mergetools/kdiff3: do
n
ot us
e
--auto
when diffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
Da
v
id A
g
uilar
help
.
c: add a comp
a
tibility c
o
m
ment
t
o cmd_ve
r
s
i
o
n
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David
Aguil
a
r
contrib
/
mw-to
-
git/t/i
n
stall-wi
k
i
.
sh: use a lower
c
a
se
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David
Aguilar
contrib/ex
a
mp
l
es/git-r
e
m
o
te
.
perl: us
e
a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
tests: use a lowercas
e
"
u
s
age
:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id Aguilar
git-svn: use
a
l
o
wer
c
ase "usage:
"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
Documentatio
n
/user-manual
.
txt: u
s
e a low
e
rcase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
templates
/
hooks-
-
update
.
sample: use a
l
owerca
s
e "usag
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
co
n
trib/hooks/setgitperms
.
perl:
us
e
a lowerca
s
e "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
c
ontri
b
/
e
xamp
l
es: use a lowercase
"
u
sage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Agu
i
lar
co
n
trib/fast-impor
t
/import-zi
p
s
.
py: use spaces
i
n
stead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguil
a
r
contrib/fast-imp
o
r
t
/import-zips
.
py: fix broken
err
o
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguila
r
c
o
ntr
i
b/fast-impor
t
: use a lowe
r
c
ase "u
s
age:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
contrib/cre
d
en
t
ial: use a
lowercase
"u
s
ag
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cv
s
i
m
port
:
u
se a lowercase
"usage:"
strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guila
r
gi
t
-cvsimp
o
r
t: us
e
a
l
o
we
r
case "
u
sage:" str
i
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
git-cvsexpo
r
tcomm
i
t
:
use a
l
o
w
ercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
gi
t
-
a
r
chimport: use a lowercase "usage:
"
st
r
i
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
av
i
d
Aguilar
git-merge-one-file: use a lowe
r
c
ase "usage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguil
a
r
g
i
t
-r
e
l
ink: use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
gi
t
-
sv
n
: use
a
lo
w
ercase
"
usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
g
i
t-sh-setup:
u
se a lowercas
e
"
usage
:
"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
Da
v
id Aguil
a
r
t
7
800: "de
f
a
ults"
is
n
o longer a bui
l
tin tool name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
D
a
vid Aguilar
t7
8
00: modernize tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David Aguil
a
r
t7800: updat
e
copyright notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David A
g
uilar
diff
t
ool: si
l
ence uninitialized variable warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David A
g
uilar
p4merge: fix pr
i
nt
f
usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
Dav
i
d Aguilar
difftool--helper:
f
ix printf usag
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
a
vid Agu
i
lar
doc: g
e
nerate
a list
o
f
valid merge to
o
ls
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
Dav
i
d Aguilar
mer
g
e
tool--lib: add functions for findin
g
available
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Agu
i
lar
m
e
rgetool--
l
ib: improve the help text in gues
s
_mer
g
e_t
o
o
l()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid Ag
u
i
l
ar
mergetoo
l
--
l
ib: simpl
i
fy command expr
e
ssions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
avid Aguila
r
mer
g
etools: s
i
mplify ho
w
we handle "vi
m
"
and
"
defaults
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
Da
v
i
d
Aguilar
mergetool-
-
l
ib: improve show_tool_h
e
lp() output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David A
g
u
i
lar
mergetoo
l
s/vim: remove
redundant diff command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
Dav
i
d A
g
uilar
mergeto
o
ls/p4merge:
H
on
o
r $TMPDIR
f
o
r the /dev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David Aguilar
mer
g
e
t
ools/p4merge: Handle "/
d
ev/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
D
avid
Aguilar
mer
g
eto
o
l--lib: Allow custom commands to override built-i
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguila
r
gitk: Rename
'
t
agcontents'
t
o '
c
a
c
hed_tagcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Teach "Reread references"
to reload
tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David Aguila
r
m
e
rget
o
ol,
d
if
f
tool: D
o
cument --tool-help consistently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguila
r
d
i
fftool: Dis
a
ble
--
s
y
mlinks on cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Ag
u
i
l
ar
dif
f
tool:
H
a
nd
l
e c
o
mp
a
re() returnin
g
-1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
avid Ag
u
ilar
d
i
f
f
t
ool:
Wrap l
o
ng line
s
for readabi
l
ity
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Dav
i
d A
g
u
ilar
difftool: Che
c
k
all return c
o
de
s
f
rom compare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
a
v
i
d Agui
l
ar
difftool: Handle f
i
nding
m
erget
o
o
l
s/ in a pat
h
with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
Aguilar
difftool: Use s
y
ml
i
nks when
d
iffing a
g
ainst the
w
or
k
tree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
Aguilar
d
ifftoo
l
:
Call the temp direct
o
ry "git
-
diff
t
o
ol"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agui
l
ar
di
f
ftool: Move option values into a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
i
fft
o
ol: Eliminat
e
global varia
b
l
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
v
id Ag
u
ilar
diffto
o
l: Si
m
pl
i
fy print_too
l
_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t7800
:
Tes
t
di
f
fto
o
l
passing a
r
guments to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David A
g
uil
a
r
m
ergetool: P
r
ovi
d
e
a
n empty
f
ile whe
n
n
eeded
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
Dav
i
d Aguil
a
r
Mak
e
file: I
m
pr
o
ve c
o
mpiler header de
p
en
d
ency check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid Aguilar
mergetools/m
e
l
d: U
s
e '--output' when a
v
a
i
labl
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
m
ergeto
o
l--lib: Refactor tools into separ
a
te files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetool--lib: Mak
e
style consistent wit
h
git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
Aguilar
d
i
ff
t
o
ol--helper: Make style con
s
istent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t/t7
5
03-p
r
e-commit-
h
ook
.
s
h
: Add GIT
_
PR
E
FI
X
te
s
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
avid Agu
i
lar
git-mergeto
o
l--lib: Mak
e
vimdiff re
t
ai
n
the current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
a
vid
A
g
uilar
git: Remove handl
i
ng
for GIT_PR
E
FIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Davi
d
A
g
uilar
setup: Pro
v
ide GIT
_
PREFIX to built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Ag
u
ilar
s
u
bm
o
d
u
l
e
s
y
n
c:
U
p
date "submodule
.
<name>
.
u
r
l"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
Dav
i
d Aguilar
mergetool: Skip autoresolved
pat
h
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
Documentat
i
on: Exp
l
a
in git-merg
e
t
ool's
use o
f
temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
D
avid Aguilar
Make
f
ile: Remo
v
e usag
e
of depre
c
a
t
e
d Pyt
h
on "has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David A
g
uilar
difftool: F
i
x '
-
-gui' when d
i
ff
.
gui
t
ool is unconfig
u
r
e
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Aguil
a
r
t7800-diff
t
ool
.
sh: Test mergetool
.
prompt
f
allback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Aguila
r
diff
t
o
o
l: Update c
o
pyright notices to list each year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next