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
Merge branch 'sg/wt-status-header-inclusion' into maint
2015-07-23
D
a
vid Ag
u
ilar
c
o
n
t
r
i
b
/subtree: ignore l
o
g
.
dat
e
configu
r
ation
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
D
a
v
id Agu
i
lar
m
erge
t
ools: a
d
d winmerge as a
buil
t
i
n tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Aguila
r
m
erg
e
t
ool--lib: set IFS for dif
f
too
l
and mergetool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
D
a
vid Aguilar
mergetools
:
st
o
p se
t
t
i
ng
$
status in merge_cmd
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
D
av
i
d Aguila
r
mergetool: simp
l
ify con
d
itionals
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
D
avid Aguilar
difftool--hel
p
er: add
exp
l
icit e
x
it
statement
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Agu
i
lar
mer
g
et
o
ol--lib: remove u
s
e of
$
s
tatus g
l
oba
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
David Ag
u
ilar
difft
o
ol: honor --trust-exit
-
co
d
e for bui
l
tin tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
David
A
guilar
d
i
ff
t
ool:
add supp
o
rt fo
r
--trust
-
exit-
c
ode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David A
g
uilar
t7610-
m
erget
o
ol: ad
d
test cases for me
r
getoo
l
.
wr
i
teToTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
avid
A
g
u
i
lar
me
r
getool: add an o
p
tion for writin
g
to a temp
o
rary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
m
erge
t
ool: use
mor
e
conservative
t
e
m
porar
y
filenam
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
vid Aguilar
test-lib-funct
i
ons: ad
j
ust styl
e
to mat
c
h CodingGuidelin
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David A
g
uilar
t7610-m
e
rgetool: use test_config to i
s
ol
a
te
t
ests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Agui
l
ar
mergetool
s
/
m
eld: make usa
g
e of `--output` configurable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
g
i
t-sh-
s
etup: m
o
v
e
G
IT_DIR initi
a
lization into a functio
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David A
g
uilar
mergetool: use
m
ore cons
e
rvative temporary fi
l
e
n
ames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
test-
l
i
b
-functions: adjust sty
l
e to match CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
Aguilar
t
7610-mergetool: pre
f
er t
e
st_confi
g
ove
r
git config
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d
A
guilar
t761
0
-merge
t
o
ol: add
missing && and remove commen
t
ed
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t761
0
-
merget
o
ol:
use t
a
bs inst
e
ad of a
mix of tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David Ag
u
i
l
a
r
c
ompl
e
t
i
on: add --sho
w
-sign
a
t
u
r
e for log and show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Ag
u
ilar
stash: pr
e
fer --quiet over shell redirectio
n
of the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David A
g
uilar
r
efs: make rev
-
parse --quiet actually quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David Agui
l
ar
t
1
50
3
: use
test_mu
s
t_be_emp
t
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David
Aguilar
Doc
u
mentatio
n
: a not
e
about s
t
dout for git rev-parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David
A
guila
r
cleanups: ens
u
re that
g
it-compat-uti
l
.
h is incl
u
ded
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
David Aguilar
stylefix: asterisks
s
tick to the variable, not the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
David
A
g
uilar
gitk: Catch m
k
dt
e
mp errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
Davi
d
A
guilar
gitk: Use mk
t
emp -d to avoid predictable
t
e
m
porary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
Da
v
i
d
Ag
u
i
l
ar
gi
t
k:
Honor
T
MPDIR when viewing e
x
ter
n
al
dif
f
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David Agui
l
ar
difftool: support repositories w
i
t
h
.
git-files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguil
a
r
pull: a
d
d -
-
ff-only
t
o
the hel
p
tex
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Agui
l
a
r
pull
:
add
p
ull
.
ff configu
r
ati
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
David Aguilar
i
ma
p
-send: eliminate
HMAC deprecati
o
n warnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
D
avid Aguilar
cache
.
h:
eli
m
i
n
ate SHA-1 deprecation warnings
o
n Ma
c
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David
A
guilar
M
a
k
efile:
a
dd support for Apple CommonCrypto facility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
D
avid Aguilar
M
akefile: fix default regex se
t
tings o
n
D
a
rwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David Aguila
r
mergetools
/
kd
i
ff3
:
do
n
ot use --auto
w
h
e
n
diffin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David Ag
u
ilar
he
l
p
.
c
:
a
d
d a c
o
mpa
t
ibility comment to cmd_vers
i
on()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
contrib/
m
w-to-git/t/install
-
w
iki
.
sh: use
a lowe
r
case
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
v
id Aguilar
c
o
n
trib/
e
xampl
e
s/git-remote
.
perl:
u
se
a
lo
w
erc
a
s
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id Aguilar
tests: use
a
lowercas
e
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Davi
d
Aguilar
git
-
svn: use
a
low
e
rcase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
Docum
e
ntat
i
on/user-manua
l
.
txt: use
a l
o
werca
s
e
"usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
templates/hooks--
u
pdate
.
samp
l
e
: us
e
a lowercase "us
a
ge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid
A
g
uil
a
r
contri
b
/
hooks/setgitperms
.
perl: us
e
a lowerca
s
e "usag
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
c
o
ntrib/example
s
: use
a
l
ow
e
rcase
"usag
e
:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avi
d
Aguil
a
r
contrib/fast-im
p
ort/import-zips
.
py: us
e
spaces
inst
e
ad
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
id
Aguilar
con
t
rib/fast-impor
t
/import-zips
.
py
:
fix
broken er
r
or
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
contrib/fa
s
t-im
p
o
r
t: use a
lowercase "usage:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
i
d
Ag
u
ila
r
c
ontrib/cred
e
ntial:
use a lowercase
"
usage:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid
A
g
uilar
git-cvsimport: u
s
e a
lowercase "usa
g
e:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
gi
t
-cvsimp
o
r
t
:
use a
lowe
r
cas
e
"usage
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
i
la
r
git-cvsexportc
o
mmit
:
use a lowerc
a
se
"
usag
e
:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
git-archimport: use a lowe
r
case
"
u
s
ag
e
:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
it-m
e
r
g
e
-one-file: use a lower
c
a
se "usage:" s
t
rin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guil
a
r
git-rel
i
nk
:
u
se a lower
c
ase "
u
sage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d A
g
uilar
git-svn: use
a
lowercase "usage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-sh-
s
etup: us
e
a lowercase "usage:"
str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David
A
guilar
t7800: "defa
u
lts" i
s
no
l
onger a builtin tool nam
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t
780
0
: mo
d
ernize tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David Aguila
r
t7
8
00:
update copyright noti
c
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Aguil
a
r
difftool: silence
uninit
i
a
l
ize
d
variable warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
Davi
d
Aguilar
p4merge: fix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
Davi
d
A
g
uilar
d
i
fftool--helper: fix
p
rint
f
u
sage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David
A
gu
i
lar
doc
:
g
enerate a list of vali
d
merge to
o
ls
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
avid
A
guil
a
r
mergetool
-
-
l
ib:
a
dd f
u
nctions f
o
r finding ava
i
la
b
le
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
avid Aguilar
merge
t
o
o
l--lib: improv
e
t
he help text
in guess_merg
e
_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
merg
e
too
l
--lib: sim
p
lify command expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetoo
l
s: simp
l
ify ho
w
we ha
n
d
le "vim" an
d
"
d
efaults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
a
vid
Aguilar
mergetool-
-
l
ib: i
m
prov
e
sh
o
w_tool_hel
p
()
output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
avid Aguila
r
merget
o
ols/vim: remove redu
n
dant
d
iff com
m
an
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
David Aguilar
mergetools
/
p4merge: Honor $TMPDIR f
o
r the /de
v
/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
D
a
vid Aguilar
mergetools/
p
4merge: Han
d
le "/dev/n
u
ll"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
mer
g
eto
o
l--lib: Al
l
ow custom comm
a
nd
s
to override built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
avid Ag
u
ilar
gitk:
Rename 'tagcontents' to 'cach
e
d_ta
g
content'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Da
v
id A
g
uilar
gitk: Teach
"Reread ref
e
re
n
ces" to r
e
load tag
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
D
avid
A
g
u
i
lar
m
e
rg
e
t
o
ol,difftool: Do
c
ument --tool-hel
p
consistent
l
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difft
o
ol: Disable --symli
n
ks
o
n cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Davi
d
Ag
u
ilar
difft
o
ol: Handle compa
r
e() returning -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Dav
i
d Aguil
a
r
d
i
f
ftool: Wrap lon
g
lines for readability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
diffto
o
l: C
h
eck a
l
l re
t
urn
c
odes
f
rom compare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftoo
l
:
Handl
e
findin
g
mergetoo
l
s/ in a
path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d Ag
u
ilar
di
f
f
tool: Use symlinks when diffing aga
i
nst the worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Ag
u
ilar
difftool: Call the
temp directory "gi
t
-difftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
A
guilar
difftool: Move
o
ption values into a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftoo
l
: Elimin
a
te
g
l
obal variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
avid Aguilar
di
f
ftool: Si
m
plify p
r
int
_
too
l
_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t7800: Test difftool pas
s
ing
argumen
t
s to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
me
r
geto
o
l: Provide
an empty
f
ile when
needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
D
a
v
id Agui
l
ar
Makefile: Imp
r
ove compiler header depe
n
de
n
cy check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid Aguilar
mergetools/meld: Us
e
'
-
-
o
utput
'
when available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Agu
i
lar
mer
g
etool
-
-
li
b
: Refacto
r
tool
s
into se
p
a
r
ate file
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
merget
o
o
l
--lib
:
M
ake s
t
yle consistent w
i
th git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Agu
i
lar
difftool--helper: Make s
t
y
le c
o
nsiste
n
t
with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Ag
u
ilar
t/t7503-pre-commi
t
-
h
ook
.
sh: Add GIT_PREFIX test
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David A
g
uilar
g
i
t-mergetool--l
i
b: Make vimdiff retain the curre
n
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David
Agu
i
lar
git:
R
emove han
d
l
ing for GIT_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
s
e
tup: Provide G
I
T_PREFIX
t
o
b
uilt-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next