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
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
2016-11-29
David Aguilar
me
r
getool: honor
mergetool
.
$to
o
l
.
trustExitCode for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-07-28
David A
g
ui
l
ar
difftool:
u
s
e
G
it::* functions instead of pas
s
ing
a
ro
u
nd
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-07-28
David A
g
uila
r
d
ifftool: av
o
id $G
I
T_DIR
a
n
d
$GIT_WORK_TREE
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-07-28
Davi
d
Agui
l
ar
s
ubt
r
ee
:
adjust funct
i
on
d
ef
i
nition
s
to match
C
odingGuidel
i
nes
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
subtree: adjust style t
o
m
a
tch C
o
d
ingGuidel
i
n
es
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-07-26
David Agui
l
ar
subtre
e
:
fix "git
subtre
e
split
--r
e
join"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-07-26
Davi
d
Aguilar
t7900-subtr
e
e
.
sh: fix quo
t
ing and broken &&
c
h
a
ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-05-16
David Aguilar
difftool: handle
u
nmerged files i
n
di
r
-d
i
ff mod
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-05-16
D
a
vid Aguil
a
r
difftool: ini
t
i
a
lize
var
i
ables f
o
r
readab
i
li
t
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-03-10
D
a
vid
Agu
i
lar
merge
t
ool: honor tempfile confi
g
u
ration w
h
en resolving
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-03-10
Davi
d
Aguilar
m
e
rge
t
ool: supp
o
rt delete/delet
e
conflic
t
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2015-10-29
Davi
d
A
guilar
difftool:
i
gn
o
re symbol
i
c lin
k
s in use_wt_file
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-23
David
A
guilar
contri
b
/subtre
e
:
igno
r
e log
.
date con
f
igurati
o
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-20
David Aguilar
m
e
rge
t
o
ols: add winmerg
e
a
s a bui
l
tin tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-20
D
a
v
i
d Aguil
a
r
merget
o
ol--lib:
s
et IFS fo
r
diff
t
o
o
l and mergetool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-11-21
Da
v
i
d
Aguilar
m
erget
o
ols: stop settin
g
$statu
s
in merge_cmd()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-11-21
Dav
i
d Aguilar
mergetoo
l
: simpli
f
y
conditio
n
als
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-11-21
David Agu
i
la
r
difftool--helper: add exp
l
icit exit
statemen
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
mergetool--
l
ib: remove use of $status
g
l
o
bal
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-11-14
David
A
gu
i
lar
di
f
ftool
:
honor --trust-exit-code for builtin to
o
ls
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-28
D
avid Aguil
a
r
d
ifftool
:
ad
d
su
p
port fo
r
--trust-exi
t
-code
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t7
6
10-mergetoo
l
: add tes
t
case
s
for mer
g
etool
.
wr
i
teTo
T
em
p
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
D
avid
A
gu
i
l
a
r
mergetoo
l
: ad
d
an option
for writin
g
to a
te
m
porary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
David Ag
u
il
a
r
mergetool:
use more conservative tem
p
ora
r
y
filenames
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
David Agu
i
la
r
t
e
st-lib-functio
n
s
: adj
u
s
t style to
m
at
c
h CodingGuidelines
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
David
A
g
u
ilar
t76
1
0
-mergetool:
u
se test_
c
onfig to
i
s
o
late test
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
Dav
i
d Agui
l
ar
mergetools/meld: make usage o
f
`--output` configurabl
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
David Agu
i
lar
git-sh-s
e
tup:
move GIT
_
DIR
i
nitiali
z
a
t
ion into a fun
c
ti
o
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d
A
g
uil
a
r
merg
e
tool:
u
se mo
r
e conse
r
v
a
tive
temporary fil
e
na
m
es
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
D
a
v
id Aguilar
test-
l
ib-func
t
i
ons
:
adjust styl
e
t
o match
C
odingG
u
idelines
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
Ag
u
ilar
t761
0
-merget
o
ol: prefer test_config over
g
i
t config
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610-mergetool: ad
d
missing && and r
e
move commented
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
i
d Ag
u
ilar
t7610-merget
o
ol:
u
se
tabs i
n
stead of a mix of
tab
s
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-07
D
av
i
d Aguilar
c
o
m
p
letion: a
d
d
-
-
show-sig
n
ature for lo
g
a
n
d s
h
ow
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-19
Dav
i
d A
g
uilar
stas
h
: prefe
r
-
-
quiet
over shell re
d
i
r
ect
i
on of th
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
refs: make
r
ev-pars
e
--quiet actua
l
ly
q
uiet
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-16
Davi
d
Aguilar
t1503: us
e
test_must
_
be_em
p
ty
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-15
David Aguil
a
r
Docu
m
entati
o
n: a note a
b
out
s
tdout for git rev-parse
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-15
David Ag
u
ilar
c
leanups: ensure
t
hat
git-compat-util
.
h i
s
included
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-02
David
Aguilar
sty
l
efix:
asteri
s
ks stick to th
e
variable, not the
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-06-27
David
A
gu
i
lar
gitk: Catch mkdtemp errors
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-06-15
David Agui
l
ar
gitk: Us
e
mktem
p
-d to av
o
id predictable temporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
gitk
:
Honor TMPDIR when v
i
ew
i
ng external
d
iffs
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-02-24
Da
v
id Ag
u
ilar
difftool: sup
p
ort
r
epositories
with
.
git-files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
p
ull: add -
-
f
f
-only to
t
he help text
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-01-16
D
a
vid Aguilar
p
u
ll: add pull
.
ff configuration
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-21
D
a
v
id Aguilar
imap-send: eliminate HMAC
d
eprecation war
n
ings o
n
Ma
c
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
cache
.
h
:
elimina
t
e SHA-1 de
p
recation wa
r
nin
g
s on
M
ac
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
Davi
d
Aguilar
Makefil
e
: add suppo
r
t for Apple Comm
o
nCrypto facility
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-11
Da
v
id
Aguilar
Makefil
e
:
f
i
x default regex sett
i
n
g
s on Darwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-09
David Aguilar
merg
e
tools/kdiff3: do
not use --auto when diffi
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-04-16
D
avid Aguilar
help
.
c: add
a
c
ompatibi
l
ity
c
o
m
men
t
to cmd
_
version(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id Agui
l
ar
con
t
rib/mw-to-git/t/ins
t
al
l
-wik
i
.
s
h
:
use a l
o
wercase
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
i
d Aguilar
co
n
trib/e
x
a
mples
/
git-re
m
ote
.
p
e
rl: u
s
e
a low
e
rcase
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
Dav
i
d Agu
i
lar
tests: use
a lower
c
a
s
e
"
usage:"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
Dav
i
d Aguilar
git-svn:
use a
lower
c
a
s
e "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ila
r
Doc
u
menta
t
ion/user-manual
.
tx
t
: use a
l
ow
e
rcase "usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
id Aguilar
templates/hook
s
--upd
a
te
.
sample: use a lowercase
"
u
s
a
g
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid A
g
uilar
co
n
trib/hooks/
s
etgitperms
.
perl:
u
s
e
a lowerc
a
se "usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Agui
l
ar
contrib/exa
m
ples:
u
se a lowercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
contrib
/
fas
t
-import/import
-
zips
.
py: use s
p
aces inste
a
d
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
Ag
u
ilar
contrib
/
fast-i
m
port/import-zips
.
py: fix broken error
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
cont
r
ib
/
fast-import: use a
lowercase "
u
s
a
ge:"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguil
a
r
c
ontrib/credential
:
use a lo
w
ercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cvsimport: use a lowercase "usa
g
e:
"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguil
a
r
git-c
v
s
impor
t
: us
e
a
lowercase "usag
e
:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
git-cv
s
exportcommit
:
u
s
e a
lo
w
e
r
c
ase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-
a
rchimport: use a lowercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
g
it-mer
g
e-one
-
file: use a
l
ower
c
ase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
git-re
l
ink
:
us
e
a lowercase "u
s
age:" strin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-s
v
n: use a lower
c
ase "usage:
"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
ui
l
ar
git-s
h
-se
t
up: use
a
lowercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
David
Aguila
r
t7800
:
"
defaults" is no lo
n
ger a
builtin tool name
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
David Aguil
a
r
t7
8
00: modernize tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-20
Dav
i
d Aguilar
t7800:
update
c
o
pyright
notice
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-17
D
a
vid Aguil
a
r
difftoo
l
:
sil
e
nce unin
i
tializ
e
d variable warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
Dav
i
d
Aguilar
p4merg
e
:
f
i
x
p
r
intf u
s
age
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
difftool--helpe
r
: f
i
x
pr
i
ntf
u
sage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
Davi
d
A
gu
i
lar
do
c
: generate a
list of
v
a
l
id merge tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Agui
l
ar
mergetool
-
-lib: add functions
f
or finding available
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
Davi
d
A
g
u
ilar
me
r
getool--lib: im
p
rove t
h
e help text in gues
s
_
m
erge_tool(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid Aguilar
mer
g
et
o
ol--lib: simplify command expressi
o
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
D
avi
d
Aguilar
mer
g
etools: sim
p
li
f
y how we hand
l
e "vim
"
a
n
d "de
f
aults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
Dav
i
d
A
guilar
mergetool--lib: i
m
prove
s
how_tool_help() output
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
mergetools/v
i
m: remove r
e
du
n
dant diff command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
Da
v
id Aguilar
mergetools/p
4
merg
e
: Honor $
T
M
P
DIR
f
or the
/
dev/n
u
ll
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
Da
v
i
d Aguilar
mergetools/p4merge: Handle
"/dev
/
n
ull"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David Aguila
r
mergetool--lib
:
Allow cus
t
om comm
a
nds to over
r
id
e
built-
i
ns
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
D
a
vi
d
Aguilar
git
k
: Rename 'tagcontents' to 'cached_t
a
gco
n
t
e
nt'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
Davi
d
Agui
l
ar
gitk: Teach "Reread references" to reload t
a
g
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
mergetool
,
difftool: D
o
cument --
t
ool-h
e
lp c
o
nsistently
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Da
v
id Agui
l
ar
difftoo
l
:
Dis
a
ble --symlinks on cygwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
D
a
v
i
d Ag
u
ilar
dif
f
tool:
H
a
nd
l
e compare
(
) returning -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
D
avid A
g
ui
l
ar
d
ifftool:
Wrap long lines
for readability
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David
A
gui
l
ar
dif
f
t
o
ol: Ch
e
ck all return codes from compare()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
Dav
i
d Aguilar
difftool
:
Hand
l
e findin
g
mergeto
o
l
s/ in a pa
t
h with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguilar
difftool
:
Use symlinks
w
hen diffing agains
t
the worktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
avid Ag
u
i
l
ar
diffto
o
l
:
Call the temp director
y
"gi
t
-difftool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d Aguilar
d
ifftool
:
Move option
v
alues into
a
h
a
s
h
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Ag
u
ilar
difftool:
E
liminate
glob
a
l
varia
b
les
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
next