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
git tag: mention versionsort.prereleaseSuffix in manpage
2014-11-14
D
a
vid A
g
uilar
difftool: honor --trust-exit-cod
e
for builtin tool
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
David A
g
u
i
lar
difftool: add su
p
port
for --tru
s
t-exit-code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguila
r
t
7610-mergetool: add
test cases for m
e
r
ge
t
oo
l
.
writeToTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
merg
e
tool: add an option for writing to a temporar
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Davi
d
Aguilar
mergetool: use more conservative tem
p
o
r
ary filenam
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
A
guilar
test-lib-functions:
adjust
style to ma
t
ch C
o
dingGuideli
n
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
v
i
d
A
guilar
t7610
-
me
r
getool: use t
e
st_config to
i
s
olate tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
id
Agu
i
lar
mergetools/meld: mak
e
usa
g
e of `--output` configurable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
id Aguilar
git
-
s
h
-setu
p
: move GIT_DIR initialization into a function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
m
e
rgetool: use more co
n
s
e
rvative tempora
r
y filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
test-lib-functi
o
ns:
a
djust
style to
m
atch
CodingGui
d
e
l
i
n
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
A
guil
a
r
t7
6
10-merget
o
ol: prefer
t
est_config over
g
it c
o
nfig
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d Aguilar
t
7
6
1
0-mergetool:
a
dd missing &
&
and re
m
ove
commented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Agui
l
ar
t7610-mergetool
:
u
s
e
tabs i
n
s
tea
d
of a mix of
t
a
b
s
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David Aguilar
completion: add --s
h
ow-sign
a
t
u
re for log and s
h
ow
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
D
a
vid
A
guilar
stash: prefer --quiet ove
r
shell redirection
o
f
the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
refs
:
ma
k
e
rev-parse --quiet actually qui
e
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David Agu
i
lar
t1503: use test_must_
b
e_empty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
Davi
d
Aguilar
Docum
e
nt
a
tion: a
n
ote about stdout for git rev-parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
D
a
vid A
g
u
i
lar
c
l
eanups: e
n
sure that git-co
m
pat-util
.
h
is included
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
David A
g
uilar
stylef
i
x:
asterisks stic
k
to
t
he variable, not the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
David A
g
u
ilar
gitk: Ca
t
ch mkdtem
p
errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
gitk:
Use mktemp -
d
to avoid pr
e
dicta
b
le temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
D
a
vid Agu
i
lar
gi
t
k:
H
on
o
r TMPDIR when vi
e
w
i
ng external diffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David Aguilar
difft
o
ol:
s
upport repositories
with
.
git-fil
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
D
a
vid Aguilar
p
u
ll: add --ff-only to the help text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Agui
l
ar
pu
l
l: add pull
.
ff configura
t
ion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
Dav
i
d A
g
u
ilar
i
map-se
n
d
: elim
i
nate HMAC deprec
a
ti
o
n
w
arni
n
g
s
on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguila
r
cache
.
h:
eliminate SHA
-
1 deprecat
i
on
warnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
Makef
i
le: add
s
uppo
r
t for Apple Com
m
on
C
rypto facility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David Aguila
r
Makefil
e
:
fix def
a
u
l
t regex settings on D
a
rwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
D
a
vid Aguilar
mergetools/kdiff
3
:
do not
use --au
t
o when diffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
Davi
d
Agu
i
lar
he
l
p
.
c
: add a compa
t
ibili
t
y
comment to cmd_v
e
r
s
i
o
n()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Dav
i
d A
g
uilar
contri
b
/
mw
-
to-gi
t
/t/ins
t
all
-
wiki
.
sh: use a
lowe
r
case
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
avid Aguilar
contrib
/
examples/git-remote
.
perl: u
s
e a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David
Ag
u
i
la
r
tes
t
s:
u
se a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
i
d Ag
u
ilar
git-svn: use a lower
c
ase "usage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
D
o
c
umenta
t
io
n
/user-manual
.
txt: use
a lowerc
a
s
e
"usag
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
templ
a
tes/hooks--update
.
sample: use a lowerca
s
e "
u
sa
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vi
d
Aguilar
co
n
trib/hooks
/
s
e
tgitpe
r
ms
.
perl: use a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
co
n
trib/e
x
amples:
u
se a lowerca
s
e "usage:
"
s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguil
a
r
con
t
rib/fast-
i
mpor
t
/imp
o
rt-zips
.
p
y
: use spa
c
es i
n
stea
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
co
n
t
r
ib/f
a
st-import/import-zi
p
s
.
py: fix broken
error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
c
o
n
t
rib/fast-import:
u
se a lowe
r
case "usage
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
contrib/c
r
edent
i
al: use a
l
owercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
git-cvsi
m
p
ort: use a lowerc
a
se
"
usage:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid A
g
uilar
git
-
cv
s
import: use
a lowercase "
u
s
age:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguil
a
r
g
i
t
-c
v
sexportc
o
mm
i
t
: use a
lowercase
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
id Ag
u
ilar
git
-
ar
c
himport: us
e
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-
m
e
r
g
e-one-file
:
use a lowerca
s
e "us
a
ge:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Ag
u
ilar
git-relink
:
use
a
l
o
wercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
g
i
t-sv
n
: use a lowercase
"
u
sa
g
e:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-
s
h-set
u
p: use a
l
owercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Ag
u
ilar
t
7
800:
"
default
s
" is no long
e
r
a builtin tool
n
ame
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
Dav
i
d Aguilar
t7800: mode
r
ni
z
e t
e
sts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
Davi
d
Aguilar
t7800: update copy
r
ight notic
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
Dav
i
d Aguilar
difftool: silence uninitia
l
iz
e
d
v
a
r
iable wa
r
ning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
p4m
e
rge: f
i
x printf
usag
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
D
avid A
g
uilar
difftool--helper: fix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David
A
guilar
do
c
: generate
a
list of valid mer
g
e tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David
A
g
uilar
mergetool--lib:
a
dd
f
u
nctions for finding av
a
i
lab
l
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David
A
guil
a
r
merg
e
t
o
ol
-
-lib: im
p
rove the help tex
t
in guess_merg
e
_t
o
ol()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David A
g
uilar
merget
o
ol-
-
li
b
: s
i
mpli
f
y command expressio
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David
Agui
l
ar
mergetool
s
: simplif
y
how we
h
a
n
dle "vim"
and "defaul
t
s"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
Da
v
id Ag
u
ilar
mergetool--lib
:
i
mp
r
o
ve show_tool_
h
elp(
)
output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
m
e
rgetools/vim:
r
em
o
ve re
d
und
a
nt diff
c
ommand
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
David Aguilar
m
e
rgetool
s
/p4merge: Hon
o
r $TMPDIR for the
/
de
v
/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
Davi
d
Aguil
a
r
mergetool
s
/p
4
merge: Handle "/d
e
v
/n
u
ll"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
Davi
d
Agui
l
ar
m
erg
e
tool--lib:
Al
l
ow c
u
stom co
m
mands
to ove
r
ride bu
i
l
t
-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
a
vid Aguilar
gitk: Rename 'tagc
o
ntents' t
o
'cached_tagcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Da
v
i
d
Aguilar
gitk: Teach "Rer
e
ad re
f
er
e
nces"
to
r
eload ta
g
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
mer
g
etool,diffto
o
l
:
Docume
n
t --
t
ool-h
e
lp con
s
istently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Davi
d
Aguilar
di
f
ftool:
Disable --symlinks on cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David A
g
uilar
difftool: Handle compare(
)
r
e
t
u
rning -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
vi
d
Agu
i
la
r
difftool: Wrap lon
g
l
i
nes for read
a
bility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David
Aguil
a
r
difftool
:
Check all return codes fr
o
m compar
e
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Davi
d
Aguila
r
d
i
f
f
tool: H
a
n
d
le f
i
n
d
i
n
g
m
er
g
etools/ in a
path
w
i
t
h
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Use sym
l
i
nks w
h
en d
i
ffing again
s
t the w
o
rktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid A
g
u
ilar
difftool:
Call t
h
e
t
emp dire
c
tory
"git-d
i
fftool
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
avid Aguilar
d
i
fftool: M
o
ve op
t
ion values
into a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d
Ag
u
ilar
difftool
:
E
l
imi
n
ate glob
a
l variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d A
g
uila
r
di
f
fto
o
l: Sim
p
lify print_tool_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t7800: Test diff
t
ool passing arg
u
ments to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
Dav
i
d
Aguilar
merg
e
to
o
l: Pr
o
vide an empty fil
e
whe
n
needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
D
avid A
g
uilar
Makefile
:
Im
p
rove compiler heade
r
depend
e
ncy check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Ag
u
ila
r
mergetools/meld:
U
se '--outp
u
t' whe
n
a
v
ailable
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
u
i
l
a
r
mergetool--lib: Refactor tools in
t
o separate
f
ile
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Aguilar
mergetoo
l
-
-
lib
:
Ma
k
e style consistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguila
r
d
iffto
o
l--helpe
r
:
Make s
t
yle con
s
istent
with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
Dav
i
d Aguilar
t
/
t7503-
p
re
-
c
ommit-hook
.
sh: Add GI
T
_PRE
F
IX
t
e
s
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David A
g
u
i
lar
git-
m
erg
e
tool
-
-lib: Mak
e
vi
m
diff
r
etain
t
he current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David A
g
uilar
git: Remove handlin
g
for G
I
T
_
PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
a
vid Agu
i
lar
s
e
tup: Provide GIT_PREFIX t
o
bui
l
t-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
D
a
v
i
d Aguilar
sub
m
odul
e
s
y
n
c
: Update "submodule
.
<name>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
merg
e
tool: Skip autores
o
lved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
D
a
vid Aguilar
Documentation: Expl
a
i
n
git-mer
g
etool's use of
tempora
r
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
Dav
i
d Ag
u
i
l
ar
Makefile
:
Re
m
ove
us
a
g
e
of depre
c
a
ted Py
t
h
o
n "has
_
key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
Dav
i
d Aguilar
diff
t
ool:
Fix
'
--gui' whe
n
diff
.
g
uito
o
l i
s
u
n
configured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t7800-
d
ifftool
.
s
h
:
T
e
s
t merget
o
ol
.
pr
o
mpt fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
difftool: Upda
t
e cop
y
ri
g
ht notices to list each y
e
ar
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next