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
filter_ref: avoid overwriting ref->old_sha1 with garbage
2014-11-14
David Agui
l
ar
difftool: h
o
nor -
-
trus
t
-exit-code for builtin t
o
ols
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
D
a
vid Aguilar
difftoo
l
: add s
u
pport for
--tru
s
t-exit-
c
ode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David A
g
uilar
t7610-mergetool: add
t
e
st cas
e
s for mergetool
.
w
ri
t
eToTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
vid
A
g
uilar
merget
o
ol: add an opt
i
o
n
for writing to a te
m
porary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Dav
i
d
Aguilar
m
e
rgetool: u
s
e mor
e
conserv
a
tive
t
em
p
orary filenam
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguila
r
test-li
b
-functions:
a
dj
u
s
t
s
t
yle to match Codi
n
gGu
i
deli
n
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Dav
i
d Aguilar
t7610-merg
e
tool:
u
se test_con
f
ig
t
o isolate
t
ests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
m
e
rgetools/m
e
ld: make
usage of `--output` configurab
l
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
Aguilar
g
i
t-sh-setu
p
: m
o
v
e
G
IT
_
DIR initial
i
z
ation into
a
f
unction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d A
g
uilar
mer
g
eto
o
l
:
use
m
ore conservat
i
ve tem
p
ora
r
y fil
e
names
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d
Aguilar
test-lib
-
functions:
a
d
j
ust style to m
a
tch CodingGuidelin
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
id
A
guilar
t7
6
10-
m
ergetool: prefer
t
est
_
c
o
n
fig over git config
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610-merg
e
t
ool: a
d
d
m
i
s
sing && and remove
c
ommente
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
id A
g
uilar
t76
1
0-mergetool
:
use tabs in
s
t
e
ad of a mix of tab
s
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David Ag
u
ilar
completion: add
--show
-
signature for log and
sh
o
w
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
Da
v
id Agui
l
ar
stas
h
: prefe
r
--quiet over shell redire
c
ti
o
n
o
f the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David A
g
uilar
refs: mak
e
rev-parse --q
u
iet act
u
ally quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
Davi
d
Aguilar
t150
3
:
u
se test_must_be
_
e
mpty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
D
avid Aguilar
D
o
cume
n
tation: a
note abo
u
t s
t
do
u
t fo
r
git rev-parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
Dav
i
d Ag
u
ilar
cleanups: ensure that git-compat-uti
l
.
h
i
s included
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
Da
v
id Aguilar
style
f
ix
:
aste
r
isks
stick to the
variable, not the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
Davi
d
Aguilar
g
itk: Cat
c
h mkd
t
emp er
r
o
r
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguila
r
gi
t
k:
Use mktemp -d
t
o avoid
predic
t
able temp
o
rary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
D
av
i
d Ag
u
ilar
gi
t
k
:
H
o
nor TMP
D
IR when
v
iewing exte
r
nal diffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
D
a
vid Ag
u
ilar
difftoo
l
: suppor
t
r
e
p
o
sitories with
.
git-f
i
les
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
p
u
ll
:
add -
-
ff-only
t
o t
h
e help
t
ext
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
D
avid Agu
i
l
a
r
pull: a
d
d pull
.
f
f configuration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
David A
g
uilar
ima
p
-send: eliminate HMAC deprecation warnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David A
g
uila
r
cache
.
h: elimi
n
ate SHA-1 depreca
t
ion warnin
g
s on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguila
r
M
akefile: ad
d
support fo
r
Apple
C
ommonCrypto facility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David
Agui
l
ar
Makefile: fix default r
e
gex
s
ettings
o
n Da
r
wi
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
D
a
vid A
g
ui
l
ar
mergeto
o
ls/kd
i
ff3:
d
o n
o
t use
-
-auto when diff
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David
A
g
uila
r
hel
p
.
c: add a compatibili
t
y comment
t
o cmd_version()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vi
d
A
g
uilar
contrib/m
w
-to-git/t/inst
a
ll-wi
k
i
.
sh: use
a lowerca
s
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid Aguil
a
r
c
ontrib/
e
xa
m
ple
s
/git
-
r
emote
.
perl: use a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
tests: use a lowe
r
case "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguil
a
r
git-svn: use a lowercase "usag
e
:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
Docum
e
ntat
i
on/
u
ser-man
u
al
.
t
xt:
u
se a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguil
a
r
templates/h
o
oks--
u
pdate
.
sample: use a lowercase
"
usag
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
co
n
t
r
i
b
/h
o
oks/
s
etgitperms
.
pe
r
l:
u
se a lowercase
"
usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
c
ontrib/examples:
u
se
a lo
w
ercase "usage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avi
d
Agu
i
lar
contrib/fast-import/import-
z
ips
.
py
:
use
s
paces instea
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
c
ontrib/fast-
i
mport
/
impor
t
-zips
.
py
:
fix broken error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
contrib/fast-import: us
e
a lowercase "usage:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguila
r
contrib/cr
e
denti
a
l
: use a l
o
wercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id
A
guilar
git-cvsimport: use a
low
e
rcase
"
u
s
a
ge:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
i
d Agui
l
ar
git-cvsimport: use a lowercase "
u
sage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cvse
x
portco
m
mi
t
: use a low
e
rcase "usage:
"
st
r
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
git-arc
h
i
m
p
o
rt: use a l
o
wercase
"usage:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id
A
guil
a
r
g
i
t
-merge-one
-
file:
use
a
lowercas
e
"usage
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
git-
r
elink: use a
l
owerc
a
se "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
git-svn: use a lowercase "u
s
age:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-sh-se
t
up:
use
a
lowerc
a
se "us
a
ge
:
" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
Davi
d
Aguilar
t7800: "
d
efaul
t
s
"
i
s
n
o l
o
nger a builtin
t
ool name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t7800: mo
d
ernize
t
es
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
D
a
vid
Ag
u
ilar
t7
8
00: update copyr
i
g
h
t noti
c
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Aguilar
diff
t
ool:
s
ile
n
ce un
i
nitial
i
z
e
d variable
w
a
r
ning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
p4mer
g
e: fix print
f
usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
D
a
vid
A
guilar
diffto
o
l--he
l
per: fix pri
n
tf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David
A
g
uilar
d
oc:
generate
a list of
v
alid merge too
l
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David
Aguilar
mergeto
o
l--lib: add functions
for finding availa
b
le
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Agui
l
ar
m
e
rgetool--lib
:
improve the help tex
t
in gue
s
s_mer
g
e_too
l
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetoo
l
--lib: s
i
mplify command ex
p
ressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetools: simplify how
we handle "vim" an
d
"default
s
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
a
v
id Aguil
a
r
merg
e
tool--lib: improve show_tool_help() outp
u
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
Davi
d
Aguilar
m
e
rgetool
s
/vim: rem
o
v
e redundant diff command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
David Ag
u
ilar
m
ergeto
o
ls/p4merge:
Honor $TMPDI
R
for the
/
dev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David Agu
i
lar
mergetools/p4mer
g
e: Han
d
le "/dev/nu
l
l
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
D
a
vid Aguil
a
r
merget
o
ol--lib:
Allow custom commands to
o
ver
r
ide built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Rename
'tagcontents' to 'cached_tagcont
e
n
t
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David
A
guilar
g
it
k
:
T
ea
c
h "Reread references"
t
o re
l
oad tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David A
g
uilar
mer
g
etool
,
diffto
o
l: D
o
cument --
t
o
o
l
-h
e
lp consistent
l
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Da
v
id Aguilar
difftool:
Disable --symlinks on cygwi
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David
Ag
u
ilar
d
i
f
ft
o
o
l: Han
d
l
e
compare(
)
retu
r
n
in
g
-1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David
A
g
uilar
difftool: Wrap long lines for
readability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Da
v
id Aguilar
d
i
fftool:
C
heck all return codes
fr
o
m compare
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Agui
l
ar
difftool: H
a
ndle finding
m
erg
e
tools/ in a
path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Use symlinks when di
f
fing against the w
o
rktr
e
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
diff
t
ool: Call th
e
t
e
mp directory "git-difftool
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Ag
u
ilar
d
ifftool: M
o
ve
o
ption va
l
ues into a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agui
l
ar
difftool:
Eliminate global varia
b
les
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agui
l
ar
dif
f
t
o
o
l: Simplify
p
rin
t
_
tool_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Aguila
r
t7800
:
T
est
difftool passing arguments
to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
merge
t
ool: P
r
ovide an emp
t
y file
w
hen ne
e
de
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David
A
g
uilar
Makefile:
Improve
comp
i
ler header dep
e
nde
n
cy check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
u
i
l
a
r
mergetools/meld: Use '--outpu
t
'
when avai
l
able
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid Aguilar
mergetool--lib: Refactor
to
o
ls into separate
f
iles
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id
Aguilar
me
r
getool--lib
:
Make style consistent
w
ith git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguila
r
diffto
o
l--he
l
p
e
r: Mak
e
styl
e
consis
t
e
n
t with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
D
avid Agui
l
ar
t
/
t7503-
p
re-commi
t
-hook
.
sh:
Add GIT_
P
REFIX te
s
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Davi
d
Aguilar
git-mer
g
e
tool--lib: Make vimdiff retain the current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git: Re
m
o
ve handling f
o
r GIT_P
R
E
F
IX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
setup: Pr
o
vid
e
G
I
T_PREFIX to built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Da
v
id
Aguilar
submodule
s
ync: Update "submodule
.
<name>
.
u
r
l"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
mergetool: Skip au
t
oresolved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
D
av
i
d
A
g
ui
l
ar
Documen
t
ation: Ex
p
l
a
i
n
g
i
t-merg
e
tool's use of t
e
mp
o
rary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
Da
v
id Aguilar
Mak
e
file: Re
m
ov
e
us
a
ge of dep
r
e
c
ated Python "has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
Dav
i
d Aguilar
diffto
o
l: Fix '--
g
u
i
' wh
e
n diff
.
guitoo
l
is uncon
f
i
gured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t
7
800
-
d
ifft
o
ol
.
sh: T
e
st
merge
t
ool
.
prompt f
a
ll
b
ack
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
Da
v
id Aguila
r
difftool:
Upda
t
e
copyright
n
otices to list each ye
a
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next