repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
rebase: return non-zero error code if format-patch fails
2014-11-14
David
Aguilar
diff
t
o
ol: honor
-
-
trust-e
x
it-code fo
r
builti
n
tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
David Aguilar
difft
o
ol:
add support for --trust
-
exit-co
d
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t761
0
-mer
g
etool: add test ca
s
es for
m
ergeto
o
l
.
writeToTe
m
p
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
A
gui
l
ar
merget
o
ol: add an option for
writing to a
temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
id Aguilar
merg
e
tool: use more conservative
t
emporary fil
e
name
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
v
i
d Agu
i
lar
test-lib-functions:
adjust style to match CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Agu
i
lar
t
7
6
1
0-me
r
getool: use test_config to isolate t
e
sts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
av
i
d Aguilar
mergetools/meld: make usage of `--output` co
n
fig
u
rabl
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
g
i
t-sh-s
e
tup: mo
v
e GIT_
D
IR initial
i
z
at
i
on
into a function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d Aguilar
merge
t
ool: us
e
more conservative
temporary filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David A
g
uilar
test-lib-functions: a
d
j
u
st st
y
le
t
o ma
t
ch
CodingGui
d
el
i
nes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
A
g
uil
a
r
t7610-
m
ergetool:
prefer test
_
config over g
i
t
co
n
fig
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
i
d
Agu
i
lar
t76
1
0-mergetool: a
d
d m
i
ssing && and remove
commented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610-me
r
getool: use tabs in
s
tead
o
f a mix of tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
Da
v
id Ag
u
il
a
r
complet
i
on:
a
d
d
-
-
show
-
sig
n
ature f
o
r log a
n
d show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Ag
u
i
l
ar
stash
:
prefer --quiet
o
ver shell redir
e
c
tion of th
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
D
a
vid Aguilar
refs: make rev-parse --quiet
a
ctually quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
D
av
i
d Aguilar
t1503: us
e
test_mus
t
_be_empty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David
A
guila
r
Docu
m
entation: a note about stdout for git
rev-
p
a
r
s
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
Dav
i
d Agu
i
lar
cleanups: ensure that git-compat
-
uti
l
.
h
i
s
inclu
d
ed
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
Davi
d
A
g
uil
a
r
stylef
i
x: asterisks stick to
the var
i
abl
e
, not the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
D
a
vid Aguilar
git
k
: C
a
tc
h
mkdte
m
p errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguil
a
r
gi
t
k: Use mktemp -d to a
v
oid predictable
t
e
m
po
r
ar
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
D
avid Aguilar
gitk: H
o
n
or
TMPDIR when v
i
ewing
e
xternal diffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David Agui
l
ar
difftool: support re
p
ositories
w
i
th
.
gi
t
-f
i
l
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
D
avid Aguilar
pu
l
l: add --ff-only to the help text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
Da
v
id
Aguilar
pull: add
p
u
l
l
.
ff c
o
nfi
g
uration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
David Aguilar
imap-send
:
el
i
min
a
te H
M
AC deprec
a
tio
n
w
a
r
n
in
g
s
o
n
Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
D
avid Aguilar
cache
.
h
:
e
l
i
minate SHA-1 deprecation
warnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Agui
l
ar
Makef
i
le:
a
d
d suppor
t
f
o
r Apple Comm
o
nCr
y
pto fa
c
ility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David Aguilar
Makef
i
le: fix default rege
x
settings on Dar
w
in
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David Aguilar
me
r
getools/kdiff3: do not use --auto when diffin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David Aguilar
help
.
c:
a
d
d
a
compatib
i
lity com
m
ent to cmd_vers
i
o
n()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Davi
d
Agui
l
ar
cont
r
ib/mw-to-
g
it
/
t/inst
a
ll-wiki
.
s
h
: us
e
a lowe
r
c
ase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Dav
i
d Aguilar
contrib/examples/git-remot
e
.
perl: us
e
a lowercas
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Ag
u
ilar
tests: use a
l
ow
e
rcase
"usage:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Davi
d
Aguilar
git-svn: use a lowercase "
u
sage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
Documentation/user-ma
n
ual
.
tx
t
: use a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Agui
l
ar
tem
p
lates/hooks--upda
t
e
.
sample: use
a lowercase "usa
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguil
a
r
contrib/hooks/setgitperms
.
perl: use a
l
o
w
e
rc
a
s
e
"usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
contrib/exampl
e
s: use a l
o
wercase "us
a
ge:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
i
d Agu
i
lar
c
o
n
trib/
f
a
s
t-import/import-zips
.
py: use spaces in
s
tea
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
contrib/fast-impor
t
/import-zip
s
.
p
y: fix broken error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
contrib/fast-import: use a low
e
rcase
"
us
a
ge:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id A
g
uilar
c
ontrib/credentia
l
: use
a
l
owe
r
case
"
usage:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cv
s
imp
o
rt: use a
l
o
wercase "us
a
ge:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Agui
l
ar
git-cvs
i
mport: use a lowercase "usage:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
gi
t
-
cvsexportcom
m
it: use a
lowercase "u
s
age:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-arch
i
mport:
u
se a lowerca
s
e "usage:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
git-me
r
ge-one-fil
e
: use
a
lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Agui
l
ar
git-r
e
link: use a lowe
r
case "usage:"
st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Agui
l
ar
g
it-sv
n
: us
e
a lowercase "
u
sage:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-sh-setup: use a lowercase "us
a
ge:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David
A
guilar
t7800: "def
a
ults" is no longer
a
builtin tool name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t7800:
modernize tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
Dav
i
d
Ag
u
ilar
t7800: update copyri
g
ht notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Aguilar
d
i
fftool: silence unini
t
i
a
lized va
r
iable wa
r
n
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Agui
l
ar
p4merge: fix printf u
s
age
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
d
ifftool--help
e
r: fix prin
t
f usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Ag
u
ilar
doc: g
e
nerate a list of
val
i
d mer
g
e
tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
merget
o
ol--lib: add functions for finding available
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Dav
i
d Aguilar
merg
e
tool--lib: i
m
pr
o
ve the help text in guess_merge_too
l
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Dav
i
d
A
gui
l
ar
merget
o
ol--lib: sim
p
li
f
y comm
a
nd exp
r
ess
i
o
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetools:
simplify how we handle "vim"
and "def
a
u
lts"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
avid Agu
i
l
ar
mer
g
etool--lib: improve sh
o
w_tool_help() outp
u
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
a
vi
d
A
g
uilar
mergetools/vim: remo
v
e
r
edun
d
ant d
i
ff command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
David Aguil
a
r
mergetools/p4mer
g
e: Honor $TM
P
D
I
R
for the
/dev/n
u
ll
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David Aguilar
m
e
rgetools/p4merge: Handle "/dev/n
u
ll"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
m
ergetool--lib: Allow custom
c
o
mmands
t
o override bu
i
lt-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Dav
i
d Aguilar
gitk: R
e
nam
e
'tagcontents'
to
'cached_tagcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Teach "Reread references" to
rel
o
ad tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
Da
v
id Aguilar
merget
o
ol,dif
f
tool:
Document --tool-help consistently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Davi
d
Aguilar
difftool: D
i
sable
-
-sy
m
links on cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool:
Handl
e
compare()
r
eturning -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Davi
d
Aguil
a
r
difftool: Wrap lo
n
g lines for
readability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
a
v
id
Aguilar
difftool: Check all return codes from
compare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David A
g
uil
a
r
d
i
ff
t
ool: Handle fin
d
ing m
e
rget
o
ols
/
in
a
p
a
th with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Ag
u
ilar
difftool: Use s
y
mlinks when di
f
fi
n
g against the worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
diff
t
o
ol: C
a
ll the t
e
mp direct
o
ry "git-difftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Move option values in
t
o a ha
s
h
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
dif
f
tool
:
Elimina
t
e glo
b
al va
r
iab
l
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Aguilar
d
ifftool: Simplify pr
i
nt_tool_h
e
lp()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Agu
i
la
r
t7800: Test difftool passing argum
e
nts to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Aguila
r
mergetool:
P
rovid
e
an empty f
i
le wh
e
n needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David
A
guilar
Makefile
:
Improve compiler h
e
ader depen
d
ency check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid
Aguilar
mergetoo
l
s/meld: Use '--out
p
ut' when available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
merg
e
t
o
ol--lib: Refacto
r
tools i
n
to sep
a
r
a
t
e
files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
Ag
u
ila
r
merge
t
o
o
l--lib:
M
ake style
consistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid
A
guilar
difft
o
ol--
h
elper: Make style
c
onsis
t
ent w
i
th git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t/t7503
-
p
re-commit-hook
.
sh: Add
G
I
T
_
PREFIX
t
e
sts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git-merge
t
ool--lib: Mak
e
vim
d
iff retain
t
he curren
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
a
v
id Aguilar
git: Rem
o
ve
ha
n
dling for GIT_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Agui
l
ar
setup: Provid
e
GIT_PREFIX
t
o buil
t
-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
submodule
sync: Up
d
ate "submodule
.
<name>
.
u
rl"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
m
e
rgetool
:
Ski
p
au
t
oreso
l
ved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David
A
guilar
Documentat
i
on: Explain
git-mergetool's use of temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
Da
v
id Agu
i
lar
Makefile: Re
m
ove
usage of deprecated Py
t
h
on
"has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David
A
gu
i
lar
d
i
fftool: Fix '--gui' when diff
.
guitoo
l
is
u
n
co
n
figur
e
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
D
a
vid
Aguila
r
t7800-difftool
.
sh: T
e
st mergetool
.
prompt fallba
c
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David
Ag
u
ilar
d
i
f
f
t
o
ol
:
Update copyright no
t
i
c
es
t
o li
s
t each
year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next