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
checkout: add --ignore-other-wortrees
2014-11-14
David
A
guilar
d
iffto
o
l:
ho
n
or --trus
t
-exit-c
o
de for builtin tool
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
David
A
guilar
difftool:
a
dd suppo
r
t
f
or -
-
tr
u
s
t-exit-code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Davi
d
Aguil
a
r
t7610-mergetoo
l
: add test cases f
o
r mergetool
.
writeToT
e
mp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
A
guilar
merge
t
ool: add an
o
pt
i
on for writing
to
a
tem
p
orary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
merget
o
ol: u
s
e more conservative temporary f
i
lenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
avid Aguilar
test-lib-functions:
adju
s
t style to match CodingG
u
idelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
av
i
d Aguilar
t76
1
0-mergeto
o
l: use test
_
co
n
f
ig to isolate te
s
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
v
id
Aguilar
merg
e
tools/meld: m
a
ke usag
e
of `--ou
t
p
ut` c
o
nfigura
b
le
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d Ag
u
ilar
git-sh-se
t
up
:
move GIT_DI
R
i
n
itia
l
i
zation into
a function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
avid Aguilar
merge
t
ool:
u
se mor
e
c
o
nservative temp
o
rary filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
id Aguilar
tes
t
-lib-functions: adjust style to match C
o
d
i
ngGu
i
delines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610-merg
e
t
o
ol: pref
e
r test_
c
onfig over g
i
t
co
n
fig
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610
-
merg
e
too
l
:
a
dd missing &
&
a
n
d r
e
move commented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguila
r
t7610-mergeto
o
l:
u
s
e
tabs inste
a
d of a
m
ix of tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David
Aguilar
compl
e
tion:
add --show-signature for log and sh
o
w
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
s
t
a
s
h: prefer --quiet over shell redirection of
t
h
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
refs: m
a
ke rev-par
s
e
--q
u
iet actually quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David Aguilar
t1503: use test_mu
s
t_be_empty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David
A
guil
a
r
D
o
c
umentation:
a note about s
t
dout for git rev-parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
D
a
vid Aguila
r
clea
n
ups
:
ensure
t
h
at git-c
o
mpa
t
-uti
l
.
h
is included
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
David Aguilar
stylefix: asterisk
s
stick to the variable, not the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
Davi
d
Ag
u
ilar
g
it
k
:
Catch mkdtemp errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguila
r
g
itk
:
Use mkt
e
mp -d
to a
v
oid predi
c
table
tempo
r
ary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
D
avid A
g
uilar
gitk: Honor
TMPDIR when viewing
e
x
ternal diff
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
Davi
d
Ag
u
ilar
difftool:
s
u
p
port repos
i
tories with
.
git-fi
l
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
pull: a
d
d
--f
f
-onl
y
to the help te
x
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
D
avid
A
gui
l
ar
pull: add pu
l
l
.
f
f
c
onfigura
t
ion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
David Ag
u
ilar
imap-send: eli
m
in
a
te
HMAC deprecation warnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
cache
.
h: eliminate SH
A
-1 depr
e
cation warnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Ag
u
ilar
Mak
e
fi
l
e:
add support for A
p
ple
C
ommonCry
p
t
o
facility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
D
avi
d
Aguil
a
r
Make
f
ile: fi
x
defa
u
lt reg
e
x
s
ettin
g
s o
n
Da
r
win
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David Agui
l
ar
m
e
rgetools/kdiff3: do not use --a
u
t
o when dif
f
in
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David
Aguilar
help
.
c: a
d
d
a c
o
mpatibil
i
ty c
o
mment to cmd_version()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Agui
l
ar
contri
b
/mw-to-git
/
t/install-wiki
.
sh: use
a l
o
w
e
r
case
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Davi
d
Ag
u
ilar
c
o
ntrib/examples/git-
r
emo
t
e
.
p
e
rl:
u
se a lowerc
a
se
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguila
r
tests:
use a lowerc
a
se
"
u
sage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Agu
i
la
r
git-svn:
use a lowercase "usa
g
e:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
D
ocumen
t
at
i
on/use
r
-manua
l
.
txt: use a
lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
templates/hooks--up
d
ate
.
s
am
p
le: use a l
o
wercase "usag
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d
A
guilar
contrib/hooks/setgitperms
.
p
er
l
: u
s
e a
lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Ag
u
il
a
r
contrib/examples:
use a
l
ower
c
ase "u
s
age
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguila
r
contrib/fast
-
import/impor
t
-zip
s
.
py
:
use spaces inste
a
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
contrib/
f
a
s
t-import/import-zips
.
py: fix broken error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/fast-imp
o
rt: u
s
e 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
vid Agui
l
a
r
c
ontrib/credential:
use a low
e
rcas
e
"
us
a
ge:
"
s
tri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid
A
g
u
i
l
ar
g
it
-
cvsimport: use a lowercase "usage
:
" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-
c
vsimpo
r
t: use a lowercase
"
u
sage:" s
t
rin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cvsexportcomm
i
t
: us
e
a low
e
rcase
"u
s
age:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Ag
u
ilar
git-archimpor
t
: use
a
lowercase "usag
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uil
a
r
git-merge-one-file:
u
se a lo
w
ercase "
u
sage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d
Aguil
a
r
git-relink: use
a
lowercase "usage:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
id Aguil
a
r
gi
t
-sv
n
:
u
se a
lowercase
"
usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
i
d
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
Dav
i
d
A
guila
r
t
7800: "def
a
ults" 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
t
7800: moderniz
e
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David Aguilar
t
7800: updat
e
copyright no
t
ice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David A
g
uilar
difftool: silence uninitialized vari
a
ble warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
D
a
vid Aguilar
p4m
e
r
ge: fix
print
f
usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
Davi
d
Aguilar
difft
o
ol--helper: fix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
avi
d
Aguila
r
doc: generate a list
of valid
m
e
r
g
e
tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David
A
gu
i
lar
mergetool--li
b
: add functions f
o
r finding available
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguil
a
r
mergeto
o
l
-
-
lib: improve the
h
el
p
t
ext in guess
_
merge_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
avid Aguilar
me
r
getool--lib:
sim
p
lify co
m
mand exp
r
essions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetools: simplify h
o
w w
e
ha
n
dle "vim" and "d
e
faults
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
mergetool--lib: improv
e
s
h
ow_t
o
ol_hel
p
() output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
Dav
i
d Aguilar
merg
e
tools
/
vim: rem
o
ve redundan
t
diff comma
n
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
D
avid
A
g
uilar
m
er
g
etools/p4mer
g
e: Hono
r
$TMPDIR f
o
r th
e
/dev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David Agu
i
lar
mer
g
e
t
ools/p4me
r
g
e: Handle "/dev
/
null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
Da
v
id Agu
i
la
r
me
r
ge
t
o
ol--li
b
:
A
llow
cus
t
om commands
to override built
-
ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: R
e
name 'tagcontents' to 'cac
h
ed_t
a
gcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
a
vid Aguilar
gitk: T
e
ach "Reread
r
ef
e
rences" t
o
reload tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
Da
v
id A
g
uilar
m
e
r
g
et
o
ol,difftool:
D
ocume
n
t -
-
too
l
-he
l
p
c
onsi
s
tently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Davi
d
A
g
uilar
difftool:
Di
s
ab
l
e --symlinks on cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftoo
l
: Handle compa
r
e
(
) retu
r
ning
-
1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
d
i
fftool: Wrap long
l
ines f
o
r read
a
bility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftool: C
h
eck all r
e
tu
r
n c
o
des f
r
om compare(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftool: Handle finding mergetools/ in a
p
a
t
h wit
h
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
avid Aguila
r
difftool: Use symlinks whe
n
diffing
a
gainst the workt
r
ee
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
v
id Aguilar
difftool: Call th
e
temp directory "
g
it-
d
i
f
ftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
Agui
l
ar
difftool: Move option
va
l
ues
i
nto a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
Agu
i
l
a
r
difftool: Elim
i
nate gl
o
bal v
a
riables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Ag
u
ilar
difftool: Simplify pr
i
nt_too
l
_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David
A
g
uilar
t7
8
0
0: Test dif
f
tool
pa
s
sing arg
u
ments t
o
d
iff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
D
a
vid Aguilar
mergetool: Provide
a
n
e
mpty file when
n
eeded
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
D
a
vid Aguila
r
Makefile
:
Improve com
p
il
e
r
h
eader
d
e
p
endency ch
e
c
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
Agui
l
a
r
m
e
rgeto
o
ls/
m
e
l
d
:
U
se '--out
p
ut' when available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Aguilar
me
r
getool-
-
lib: R
e
factor
tools i
n
t
o separate files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d
Aguil
a
r
merg
e
tool--lib: Make style consistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
dif
f
tool--helper: Make
s
tyle c
o
nsistent
w
it
h
git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
D
avid
A
guilar
t/t7503-pre-
c
ommit-hook
.
sh: Ad
d
GIT_PREFIX te
s
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Agu
i
lar
g
i
t
-mergeto
o
l--lib
:
Ma
k
e v
i
m
d
i
ff retain the
current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
avid Agu
i
lar
git: Remove handlin
g
f
or G
I
T_P
R
EFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David
A
guila
r
setup:
P
ro
v
i
de GIT_PREFIX to
built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
submodule sync: Update "s
u
b
modul
e
.
<n
a
me>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
Davi
d
Aguilar
mergetool: Skip autoresolve
d
p
a
t
hs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David Aguila
r
Docu
m
ent
a
tion: Exp
l
a
i
n git-mergetool's us
e
of te
m
porary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
Da
v
i
d
A
guilar
M
a
kef
i
le:
Remov
e
usage of deprecat
e
d Pyt
h
on "has
_
k
e
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
Davi
d
A
gui
l
ar
d
ifftool:
Fix
'
-
-gui'
w
h
e
n
diff
.
guit
o
ol i
s
u
nconfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David A
g
uil
a
r
t7800-diff
t
o
o
l
.
sh: Test mergetool
.
p
r
om
p
t
fal
l
back
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David
A
g
uila
r
d
i
fftool:
U
pdate
c
o
p
yright not
i
ces to list each
y
ear
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next