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
stash: prefer --quiet over shell redirection of the standard error stream
2014-09-19
D
av
i
d
Aguilar
s
tash:
p
re
f
er
--quiet over shell redi
r
ection
o
f the
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-19
D
avid Aguilar
refs: make rev-parse -
-
quiet actu
a
lly
quie
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-16
David Agui
l
a
r
t1503:
u
se test_must_be_empty
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-15
D
avid Aguilar
Docu
m
e
n
tation: a note about stdout for git rev-pa
r
se
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-06-27
David Aguila
r
g
itk: Catch mkdtemp errors
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-06-15
David A
g
uilar
gitk: Us
e
mktemp -d to a
v
o
id pred
i
c
t
a
ble temporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-06-15
D
a
vid Aguilar
gitk: Honor TMPDIR when v
i
e
w
ing
e
xte
r
nal di
f
fs
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-02-24
D
avid
Aguilar
difft
o
ol:
supp
o
r
t
repositories wi
t
h
.
git-fi
l
es
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-01-16
David Agui
l
ar
p
u
ll: a
d
d --ff-
o
nly to the help
t
ex
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-01-16
D
a
vid
Ag
u
ilar
pull: add pull
.
ff configurati
o
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-21
David Aguilar
imap-send: eli
m
inate HMAC
d
eprec
a
t
i
on w
a
r
n
ings
on
Mac
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
Davi
d
Agu
i
l
a
r
c
a
che
.
h:
e
lim
i
nate SHA
-
1
dep
r
ecation warnin
g
s on Mac
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
Makefile: add support fo
r
Apple CommonCrypto facility
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-11
David Agu
i
lar
Makefile:
fix default rege
x
setti
n
gs o
n
Darwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-09
D
a
vid Aguilar
mergetoo
l
s/kdiff3: do not use
-
-
a
uto
w
hen di
f
fing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-04-16
D
a
vid A
g
u
i
lar
help
.
c
:
add
a
co
m
pat
i
bi
l
ity comm
e
nt to cmd_
v
e
r
sion()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
cont
r
ib/mw-to
-
git/t/
i
nst
a
ll-wiki
.
sh: use
a
l
o
wercase
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
cont
r
ib/examples/git-remote
.
perl: use a lowerc
a
se
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
D
avid Aguilar
tests: use a
lowe
r
case "usage:" stri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David
A
guilar
git-svn: use a lo
w
ercase
"usa
g
e:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
Documentation/user
-
manual
.
t
xt: use
a
lowercase "usa
g
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
t
emp
l
a
t
e
s
/
h
o
ok
s
--update
.
sample: use a lowerc
a
se
"
usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
a
r
c
ontrib/hooks/
s
e
t
gitperms
.
perl: use a lowercase "usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
c
ontri
b
/
examp
l
es: use a lowercase "us
a
g
e
:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
contrib/fa
s
t-impor
t
/
i
mport-zips
.
py: use sp
a
ces instead
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
contrib/fast-im
p
o
r
t
/import-zips
.
py:
fix broken error
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
contrib/
f
ast-import: use a l
o
w
e
r
case "usage:"
s
tring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Agui
l
ar
contrib/
c
redential: use
a lowercase "
u
sage
:
" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
A
g
u
i
lar
g
i
t-cvsimport: use a lowerc
a
se "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
it-
c
v
s
i
m
port: use a lowercase
"usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
gi
t
-
cvsexportcomm
i
t: use a lowercase
"usage:" stri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
git-ar
c
h
i
m
port:
u
se
a
low
e
rca
s
e "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid
A
gu
i
lar
g
it-merge-one-
f
ile: use a lowercas
e
"usage
:
" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-re
l
ink: use a l
o
werc
a
se "usa
g
e:" str
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-svn: use a lowercase "usage:"
s
tr
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
i
t-s
h
-setup: use a low
e
r
c
ase "usage:" st
r
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
David Agui
l
a
r
t7800: "defaults" is no l
o
nger a buil
t
in too
l
n
ame
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
David A
g
uilar
t7800: m
o
de
r
nize tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-20
David Aguilar
t7800: upd
a
te copyright notice
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-17
D
a
vid
Aguilar
d
i
ff
t
ool: sil
e
n
c
e uninit
i
alized v
a
riabl
e
w
a
rnin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
p4merge: fix printf usag
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
di
f
f
t
ool--helper: fix prin
t
f usa
g
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
D
a
vid Aguilar
d
o
c
: generate a list of valid m
e
rge tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
D
a
vid
Aguilar
merget
o
ol--lib: add
f
unc
t
ions for findin
g
a
vailable
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetool-
-
lib:
i
mprove the help t
e
x
t
in gu
e
ss_merge_tool()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David A
g
ui
l
ar
merg
e
to
o
l--lib: simplify c
o
mman
d
ex
p
re
s
sio
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Agu
i
lar
mer
g
etools: si
m
plify how we han
d
l
e
"
vim
"
a
n
d
"defa
u
lts"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Ag
u
ilar
me
r
g
et
o
o
l--lib: improve show_to
o
l_help() o
u
t
p
ut
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
D
a
vid Aguilar
mergetools/vim:
r
emov
e
red
u
ndant diff co
m
m
and
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
David Ag
u
ilar
merg
e
t
ools/p4merge: Honor $TMPDIR for th
e
/dev/null
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
David Aguil
a
r
m
e
rgetools/
p
4merge:
H
andle "/dev/n
u
ll"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
Dav
i
d Aguilar
mergetool--
l
i
b: Allow
custom comm
a
nds to override buil
t
-i
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: R
e
name
'tagcontents'
to 'cached_tagconte
n
t'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Teach "Reread r
e
f
e
r
e
nces" to
reload t
a
gs
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
David Ag
u
ilar
mergetool,difft
o
ol
:
Docu
m
ent --too
l
-help consiste
n
tly
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Da
v
id Aguilar
d
i
fftool: Disa
b
l
e
--symlinks on c
y
gwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
D
a
vid Aguilar
difftoo
l
:
H
andle com
p
a
r
e() return
i
ng -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
d
i
ff
t
ool: W
r
ap long lines f
o
r r
e
adability
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Ag
u
i
lar
d
i
fft
o
ol: Check all return codes fro
m
compare()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
D
a
vid
A
g
uilar
difftool: Handl
e
fi
n
ding mergetools/
in a path wi
t
h
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool
:
Use s
y
mlin
k
s when diffing against the worktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
Aguilar
d
ifftool: Cal
l
the temp
d
irectory "git-difftool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Aguilar
d
i
fftool: Mo
v
e
o
p
ti
o
n
v
alues into a
h
ash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d
A
guilar
diff
t
ool: Eliminate g
l
o
b
al variables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Aguilar
d
ifftool
:
Simplif
y
pr
i
nt_tool_help()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t7800:
Test di
f
f
t
ool passing arguments to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David
A
guilar
m
erg
e
t
o
ol: Pr
o
vide an
empty
file
w
hen needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David
A
guilar
Makefile:
I
mp
r
ove
compile
r
he
a
der dependency chec
k
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguil
a
r
mergetools
/
meld: Use
'--output' when avail
a
ble
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d Aguilar
mergetool--lib: Refa
c
tor to
o
ls into
se
p
a
ra
t
e files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Aguila
r
merg
e
t
o
ol--lib
:
Make sty
l
e consistent with g
i
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
avid Ag
u
ilar
difftool--
h
el
p
er: Make
s
tyl
e
co
n
sistent wit
h
g
i
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David
A
guilar
t/t7503-
p
re-commit-hook
.
sh: Add GIT_PREFIX t
e
sts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
avid Agu
i
lar
g
i
t
-mergetool--l
i
b: Make vimdiff r
e
tain
t
h
e current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
avid Agui
l
ar
git:
Remove ha
n
dlin
g
for GIT_PREFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David
Agui
l
ar
setup: Pro
v
ide GI
T
_PREFIX to buil
t
-
ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David Aguil
a
r
submodule sync: Up
d
ate
"
submodule
.
<name>
.
url
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David
A
gu
i
lar
m
ergetool: Sk
i
p
autor
e
s
o
lve
d
paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
Da
v
id Ag
u
ilar
D
ocumentation: Expl
a
i
n
g
i
t-merg
e
tool's
use of tempor
a
ry
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David
A
guila
r
Ma
k
efil
e
: Remove usag
e
of deprecated Python
"
has
_
key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
d
i
fftoo
l
: F
i
x '--gui' when diff
.
guitool is unconfigured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
D
a
vid Aguilar
t7800-diff
t
ool
.
sh: Test merge
t
ool
.
prompt fall
b
ack
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
Dav
i
d Aguilar
d
ifftool:
Upd
a
te
copyr
i
g
h
t notices to list each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid
A
g
uilar
dif
f
tool: Use
e
val to expand '--ext
c
md' exp
r
essions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
D
avid Aguilar
diff
t
ool: Add '-x' an
d
as a
n
ali
a
s for '--extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vi
d
Aguilar
t
7
800-diffto
o
l
.
sh
:
Simplify t
h
e --ex
t
cmd test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
Aguilar
git-diff
.
txt: Link to git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
A
g
uilar
di
f
ftoo
l
: Allow
spe
c
ifying unconfigu
r
ed
c
ommand
s
wit
h
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Ag
u
ilar
difftool--helper: Remove use of the GIT_
M
ERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difft
o
ol
-
-
h
elper:
Update copyright
a
n
d
remove distr
a
cting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
git
-
difftool:
A
dd
'
--gui'
f
or
s
electing a GUI to
o
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t7800
-
difftoo
l
: Se
t
a
bogus tool for
use by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David
A
guilar
help: Do not un
n
ecessarily look for a reposi
t
ory
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Aguil
a
r
submod
u
le
.
c: Squelch a "
u
se before
a
ss
i
gnment" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
i
d Ag
u
ilar
diff:
generate
p
retty filenames in prep_temp_blob
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Aguilar
compat: add a basename() compatibil
i
ty function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d Aguilar
compat: add a mkstemps() com
p
atibility function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id Aguilar
Add
g
i
t-rep
l
ace to
.
g
i
t
ignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
Da
v
id Aguilar
m
er
g
e
tool--lib: add
s
uppor
t
for
a
raxis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David Aguilar
m
e
r
g
etoo
l
--lib: spec
i
a
lize diff options for
e
m
erge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
next