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
t3903: stop hard-coding commit sha1s
2014-11-14
D
avid Aguila
r
difftool: honor --trust-exit-code
f
or builtin tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
David Agu
i
l
a
r
difftool: add supp
o
rt for -
-
t
r
ust
-
e
xit-
c
ode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t7610-mergetool: add tes
t
cases for merget
o
o
l
.
wri
t
eTo
T
emp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergeto
o
l: add an option for writing to
a
temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguila
r
m
e
rgetool: u
s
e
more
c
o
nservative tempora
r
y filen
a
mes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
v
i
d
Ag
u
il
a
r
test
-
li
b
-
fu
n
ct
i
o
ns: a
d
just style to mat
c
h Codi
n
gGuid
e
l
ines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Dav
i
d Aguilar
t7610-mer
g
et
o
ol
:
use
t
est_config
t
o i
s
ola
t
e tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Agui
l
ar
mergetools/meld: make
usage of `--outp
u
t` configurable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
a
v
id
Aguil
a
r
git-sh-setup: m
o
v
e
G
IT_DI
R
initializati
o
n into a
function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
avid Aguilar
m
e
rg
e
tool:
use more conser
v
ative temporary filename
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
av
i
d Aguil
a
r
test
-
li
b
-functi
o
ns: adjust style
t
o match C
o
dingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Agui
l
ar
t
7610-mergetool:
p
refer test
_
config o
v
er git config
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610-mergetool: add mis
s
ing && and remove commented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t76
1
0-mer
g
etool:
u
se tabs
i
nstead of
a
m
i
x
of tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David Aguilar
completion: add -
-
s
h
ow-signature fo
r
log and show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
D
av
i
d Aguilar
stash:
p
refer --q
u
iet over shell redirection o
f
the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
ref
s
: make rev-p
a
rse --qu
i
e
t actually quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
Davi
d
Aguilar
t
15
0
3
:
u
se
tes
t
_must_be_emp
t
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
Davi
d
A
gui
l
ar
D
ocu
m
entation:
a note abou
t
stdout for git rev-parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
D
a
vid
A
gu
i
lar
cl
e
anups: ensure that g
i
t-co
m
pat-util
.
h i
s
incl
u
ded
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
David
A
guilar
stylefix:
asterisk
s
stick
t
o
the variable, not the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
Dav
i
d Agu
i
lar
gitk: Ca
t
c
h
mkdtemp errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Ag
u
i
l
ar
g
itk: Use mktemp -d to avoid predictab
l
e temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
D
a
v
i
d Aguilar
git
k
:
H
onor TMPDIR when viewing extern
a
l diffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David
Aguilar
d
i
fft
o
ol: support rep
o
sitori
e
s with
.
git
-
files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
D
a
vid Agu
i
l
a
r
pull:
add --ff-on
l
y to the help text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
pul
l
: add pul
l
.
ff con
f
ig
u
ratio
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
David Aguila
r
i
m
ap-send:
eliminate HMAC deprecatio
n
war
n
ings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David
A
guilar
cache
.
h: eliminat
e
SH
A
-1 deprecation warnings o
n
Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
Makefile: ad
d
support
f
o
r
A
ppl
e
CommonCrypto fa
c
il
i
t
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
Da
v
id Aguilar
Makefil
e
: fix default regex
setti
n
gs on
Dar
w
in
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
Da
v
id Aguilar
mergetool
s
/kdiff3: do
not use --auto when diffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
Davi
d
Aguilar
h
elp
.
c:
a
dd a compatibility
c
omment to cmd
_
version()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
contrib/mw-to-git/t/install-wiki
.
sh: use a low
e
rcase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
avi
d
Aguilar
co
n
tri
b
/exampl
e
s/git-re
m
ote
.
perl:
u
s
e
a l
o
wercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David A
g
uilar
tests: use a lowercas
e
"usage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
git-s
v
n
:
use a lower
c
ase "us
a
ge:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
Documentation/user-manual
.
t
x
t: use a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
A
g
uilar
templa
t
es
/
h
o
oks--upd
a
te
.
sample: use a lower
c
ase
"
usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
l
ar
contrib/h
o
o
k
s/setgitperm
s
.
perl: use a lowercase
"
u
sage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
contrib/exa
m
ples: use a lowercase "usa
g
e:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/fast-import/import-zip
s
.
py: use spaces instead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
contrib/fa
s
t-impo
r
t/import-zips
.
py: fi
x
br
o
ke
n
error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/fast-imp
o
rt: use a lo
w
ercase "
u
sage
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
con
t
r
ib/credential: use a lowercase "usage:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id A
g
uilar
g
it-cvsimport: use
a
l
owercase
"
usag
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cvs
i
m
p
ort: use a lowe
r
case "usage:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Agu
i
lar
git-cvsexportcommi
t
: u
s
e a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Ag
u
ilar
git-archimport: use a lowercase "usa
g
e:
"
stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
g
it-
m
erge-one-
f
i
l
e: use a low
e
rcase "usag
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
it-relink: use a lo
w
e
r
case "usage:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id
A
g
u
i
lar
g
it-svn
:
use a
l
owercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
git-sh-setup: use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Ag
u
ilar
t7800
:
"d
e
f
a
ults" is no
l
ong
e
r a builtin t
o
ol nam
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t7800
:
mode
r
ni
z
e tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David
A
gu
i
lar
t7800:
update copyright n
o
t
ice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Agu
i
lar
d
i
ffto
o
l: sil
e
n
c
e u
n
ini
t
ialized variable
w
ar
n
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
p4me
r
ge
:
f
ix
p
rintf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
difft
o
ol
-
-helper: fix printf
u
sage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
Davi
d
A
guilar
d
o
c
:
g
e
ner
a
te
a l
i
s
t of
valid merge
t
ools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
a
vid
Aguila
r
mergetool--lib: add
f
u
n
ctions
for fi
n
ding ava
i
lable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David
Aguilar
me
r
getool--
l
ib: improve the
help
text
i
n
g
uess_me
r
ge_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Davi
d
Aguilar
mer
g
etool--l
i
b: simpl
i
fy comma
n
d
expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
av
i
d
Aguila
r
mergetools: simplify how we handle "v
i
m" and "defaults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
mergetool--lib:
i
mprov
e
show_tool_hel
p
() o
u
tput
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
a
vid Aguilar
merge
t
ools/vi
m
:
remov
e
redundant diff
comman
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
Da
v
id Agu
i
l
a
r
m
ergetools/
p
4merge: Honor $T
M
PDI
R
f
or th
e
/dev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
Da
v
id
A
guilar
mergetools/p4me
r
ge: Ha
n
dle "/
d
ev/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David A
g
uilar
mer
g
et
o
ol--lib: Allow custom commands
to override b
u
ilt-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Dav
i
d Aguilar
gitk: Rename
'
t
agcont
e
nts' to '
c
ached
_
tag
c
ontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David
A
guilar
gitk:
Teach "Reread references" t
o
reload tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
merge
t
o
ol,d
i
f
f
tool: Docum
e
nt --to
o
l-help consi
s
t
e
n
t
ly
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Dav
i
d Agu
i
lar
difftoo
l
: Disable -
-
symlin
k
s o
n
cygw
i
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Agui
l
ar
d
i
fft
o
ol: H
a
nd
l
e comp
a
re() returning
-
1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
vid Aguila
r
diff
t
ool: Wrap long
li
n
es
for readability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David
A
g
ui
l
ar
difftool
:
Check all return codes
from compare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftool: Handl
e
finding
mergetoo
l
s
/ in
a
pa
t
h wi
t
h
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id A
g
ui
l
ar
difftool:
U
se
s
ymlinks when dif
f
ing a
g
ainst the work
t
r
ee
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Ag
u
ilar
difftool: Call
t
h
e temp
d
irectory "g
i
t-difftool
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Aguilar
difftool: Move opti
o
n val
u
es into a ha
s
h
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguilar
difftoo
l
: Eliminate global vari
a
bles
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
avid
A
guila
r
difftool
:
S
implify print_t
o
ol_h
e
lp
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Agui
l
ar
t7800: Test dif
f
tool passing
arguments to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
D
avid Aguilar
mergeto
o
l: Provide an empty fi
l
e
when needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David
Aguilar
Makefile: Improve compile
r
header d
e
pendency
c
heck
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
avid Aguilar
mergetools/meld
:
Use '--out
p
u
t
' when availab
l
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Agu
i
l
a
r
mergetool--lib:
R
efactor
tools int
o
separate
file
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
A
guilar
m
e
rg
e
tool--lib: Mak
e
style
c
onsistent with g
i
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguila
r
difftool--helper: Make s
t
yle
c
o
nsistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
D
avid Aguilar
t/t750
3
-pre-com
m
it-hoo
k
.
sh: A
d
d GIT
_
PREFIX
test
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Dav
i
d A
g
uilar
git-me
r
g
etool--lib: Make
vimdiff retain th
e
cur
r
ent
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
avid Ag
u
ilar
git: Remove hand
l
ing for GIT_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
set
u
p
:
Provide
G
IT_PREF
I
X
to built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
submodul
e
sync: U
p
date "submodule
.
<na
m
e>
.
url
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
merget
o
ol: Skip autoresolved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
D
o
cumen
t
a
tion: Explain git-
m
erg
e
tool'
s
u
s
e o
f
temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
Davi
d
Ag
u
ilar
Makefile: Remove usage of deprecate
d
Py
t
h
on "has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
Davi
d
Aguilar
difftool: F
i
x
'--gui' when
diff
.
gui
t
ool i
s
unconfi
g
ure
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t7800
-
d
ifftool
.
sh:
Te
s
t mer
g
etool
.
p
r
omp
t
fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Ag
u
ilar
di
f
ftool: Upda
t
e copyri
g
ht
noti
c
e
s to l
i
st each year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next