repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
stop putting argv[0] dirname at front of PATH
2014-11-14
David
A
guil
a
r
difftool: honor --trust-exit-c
o
de for
b
u
iltin tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
David Aguilar
difftool
:
add support for
--trust-exit-code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguil
a
r
t761
0
-mergeto
o
l: add test c
a
ses for m
e
rgetool
.
writ
e
ToTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergetool: a
d
d
an option for w
r
i
t
ing to a temp
o
rary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
id Agu
i
l
ar
m
ergetool:
u
se m
o
re
cons
e
rvative tempor
a
ry
f
ilenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
test-
l
i
b-functions
:
adjust sty
l
e to match Cod
i
ngGuidel
i
ne
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Davi
d
Agui
l
ar
t7610-m
e
rgetool: use
t
e
s
t_conf
i
g to isolate tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Agu
i
l
a
r
mergetools/meld: make us
a
ge o
f
`--output` configu
r
a
ble
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Agu
i
lar
git-sh-
s
etup: move GIT_
D
IR in
i
tialization into a functi
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
mer
g
e
tool: use more conserv
a
tiv
e
tem
p
ora
r
y file
n
ames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Agu
i
lar
test-
l
i
b
-funct
i
ons:
adjust
s
tyle to match
Co
d
ingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Agu
i
lar
t7610-mergetool
:
prefe
r
t
est_co
n
fig
o
ver git config
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
avid Agu
i
lar
t7610-mer
g
eto
o
l: add
m
iss
i
ng
&
& a
n
d remove c
o
m
m
en
t
ed
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
Aguil
a
r
t7610-m
e
rgetool:
use tabs
i
n
s
tead
of a mix of tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David Aguilar
complet
i
on: add
--s
h
ow
-
signature fo
r
log and
show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
stash: pref
e
r
--quiet over sh
e
ll
r
e
direction of
the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
refs: m
a
k
e
rev-parse --quiet actu
a
lly quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
Dav
i
d Aguilar
t1503: use test_must_be_empty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
Davi
d
Ag
u
ilar
D
o
cumentatio
n
: a not
e
about
s
tdo
u
t f
o
r gi
t
r
ev-pars
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguilar
cle
a
nups:
ensure that git-compat-util
.
h is included
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
Da
v
id Aguilar
stylefix: asterisks stick t
o
the
v
ari
a
bl
e
, not
t
he
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
David Aguilar
gitk:
C
a
tch mkdtemp errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
D
a
vid
A
g
u
i
la
r
g
itk: Use mk
t
emp -d to
a
void
p
redic
t
able temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
gitk:
H
onor TMPDIR when viewing ext
e
r
nal diffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David Agu
i
lar
d
i
fftool: suppor
t
repos
i
tories
w
i
th
.
git-file
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
pull: add --ff-
o
nly to the h
e
lp text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David
A
guilar
pul
l
:
a
dd
p
ull
.
ff
c
onf
i
g
ura
t
ion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
David Aguilar
imap-send: el
i
mi
n
ate
H
MAC deprecati
o
n
w
a
rnin
g
s on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
Davi
d
Aguilar
cache
.
h:
e
limina
t
e SHA
-
1 deprecation wa
r
n
i
n
gs o
n
Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
D
avid
Aguilar
M
a
kefile: add
suppo
r
t for Apple Comm
o
nCrypto facility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
D
avid
Aguilar
Ma
k
e
file: fix defau
l
t
regex
settings on Darwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
D
a
vid Aguilar
merget
o
o
l
s/k
d
iff3: do not
u
se --auto
w
hen diffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
Davi
d
A
g
uilar
help
.
c: add a
c
ompatibility comment to c
m
d
_ver
s
io
n
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David
Aguila
r
contrib/
m
w-to-git/t/
i
ns
t
all
-
wiki
.
sh:
u
se a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Ag
u
ilar
c
on
t
rib/example
s
/
g
it-
r
emote
.
perl: use a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David
A
guilar
te
s
t
s
:
u
s
e a l
o
w
e
rcas
e
"
u
sage
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Ag
u
ilar
git-
s
vn: use a lo
w
ercase "
u
sag
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguil
a
r
D
o
cumentati
o
n/user-manu
a
l
.
txt: use a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
templa
t
es/hooks--updat
e
.
samp
l
e:
us
e
a lo
w
er
c
ase "u
s
age
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
contri
b
/hooks/
s
etgitp
e
r
ms
.
perl: use a low
e
rcas
e
"usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid
A
guilar
contrib/ex
a
mple
s
: u
s
e a lo
w
er
c
ase
"usage:" s
t
r
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
id
A
g
u
i
l
ar
contr
i
b/fast-
i
m
p
ort/import-zips
.
py: u
s
e spaces
i
nstead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
contrib
/
fast-impor
t
/import-zip
s
.
py: fi
x
broken err
o
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguila
r
contri
b
/fast
-
import: use a l
o
wercase
"
usage
:
"
s
tri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
c
ontrib/credential
:
use a lowercase "usag
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-c
v
si
m
port:
use a lo
w
er
c
ase "u
s
age:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
git-cvsimport:
u
se
a
lower
c
ase "us
a
ge:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
git-cvsexportcommi
t
: use a
l
o
w
er
c
ase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
git-archim
p
o
r
t
:
u
s
e a lo
w
ercase "u
s
age:" s
t
r
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-merge-one-file
:
use a lowercase
"
u
s
age:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git
-
relink: use a lowerc
a
s
e "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
gu
i
la
r
git-svn: use a l
o
wercas
e
"usage:
"
str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d
A
guilar
git-sh-setup
:
use a lower
c
a
s
e "usa
g
e:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
D
a
vid Aguilar
t7800: "def
a
ults
"
is no lo
n
ger a builtin tool
n
a
me
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t78
0
0: modernize
t
ests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David Agui
l
a
r
t7800: update copyri
g
h
t
n
otice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Agu
i
lar
diff
t
o
ol: silence
u
nini
t
ialized var
i
able
w
arning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Ag
u
ila
r
p4
m
erge:
f
i
x printf
u
s
a
ge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David
Aguilar
difftool--h
e
lper: fix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Agu
i
lar
d
o
c
: g
e
nerate a list of valid merge to
o
ls
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David
Aguilar
merg
e
t
o
ol--lib: ad
d
functions for finding
a
vailable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
a
v
i
d
Aguilar
mergetool--lib
:
improve t
h
e help text in guess_merge
_
to
o
l()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David A
g
uilar
merg
e
tool-
-
lib:
si
m
plify co
m
m
a
nd
e
xpress
i
ons
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Agu
i
lar
merget
o
ols: simplify how we handle "vim"
a
nd
"
defaul
t
s"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
Da
v
id Ag
u
i
lar
merg
e
tool--lib
:
impr
o
v
e show_to
o
l_help() output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
a
vi
d
Aguil
a
r
merg
e
tools/vim: remove r
e
dundant d
i
f
f
command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
Davi
d
Aguila
r
mergetools/p4merge: Ho
n
or $TMPDIR f
o
r
t
h
e /
d
ev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David A
g
uilar
mergeto
o
ls/p4m
e
rge: H
a
n
d
l
e
"/dev/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
D
avid
Aguilar
merget
o
ol--lib: Allow custom command
s
to override
built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Rename '
t
agcontents' to 'cached
_
t
a
gconten
t
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguila
r
g
itk: Teac
h
"Re
r
ead ref
e
re
n
ces" to reload tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
D
avid Aguila
r
merg
e
tool,difftool: Document
-
-
tool-help consistent
l
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
avid Ag
u
ilar
difftool: Disable
--symlinks on cygw
i
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David
Agu
i
lar
difftool: Handle compare() returnin
g
-1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
d
ifftool: Wra
p
l
ong
lines for read
a
bility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftool: Chec
k
all return codes from compare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Da
v
id Aguil
a
r
difftool: Handle fin
d
ing
mergetoo
l
s
/
in a path wit
h
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
A
guilar
difftool:
Use syml
i
nks w
h
en diffing agains
t
t
h
e worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agu
i
lar
diff
t
ool: Call
t
he t
e
mp
d
i
r
e
ctor
y
"
gi
t
-difftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agu
i
lar
difftool: Move option values i
n
to
a
hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
A
gui
l
ar
dif
f
too
l
: Eliminate global variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguilar
di
f
ftool: S
i
m
p
l
ify print_tool
_
help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Ag
u
il
a
r
t7
8
00: Test difftool passi
n
g arguments t
o
d
iff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Ag
u
ilar
mergeto
o
l: Pro
v
ide
a
n em
p
ty file when needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
Makefile:
I
m
pr
o
ve compiler he
a
der dependency check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
Agui
l
a
r
m
e
rgetools/meld: Use '--o
u
tput' when availa
b
le
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Aguil
a
r
me
r
getool--lib: Refactor tools into sepa
r
a
te fi
l
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Aguilar
mergetool--lib: Ma
k
e s
t
yle consiste
n
t with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
Agu
i
lar
dif
f
tool--he
l
per: Make style consistent wi
t
h git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
D
av
i
d Ag
u
il
a
r
t/t7503-
p
re-comm
i
t-hook
.
s
h
: Add G
I
T
_
PREFIX test
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Dav
i
d
Aguila
r
git-mergetool--lib:
M
ake vimdiff retain the curr
e
n
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git: Remo
v
e
h
andling for GIT_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
id Agu
i
la
r
setup: Provide GIT_PREFIX to built-i
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Da
v
id A
g
uila
r
submodule sync: Update "subm
o
d
ule
.
<name>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David
Aguila
r
mergetool: Skip autoresolved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David
A
gu
i
lar
Documenta
t
i
o
n
: Explain
git-mer
g
etool
'
s use of
t
emporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
Da
v
id Agui
l
a
r
Make
f
ile: Rem
o
ve usage
o
f
deprecated
P
y
thon "
h
as_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
Davi
d
Aguilar
difftool
:
Fix '--gu
i
' when dif
f
.
guitoo
l
is u
n
configured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Aguila
r
t7800-difftool
.
sh:
Test mergetool
.
pr
o
mpt
f
allback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
difftool: Update copyright notices to list
e
ach year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next