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
cache.h: eliminate SHA-1 deprecation warnings on Mac OS X
2013-05-20
David Aguilar
c
a
ch
e
.
h
: eliminate SHA-1 de
p
recation warnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
Davi
d
Aguilar
Makefile: add suppor
t
f
or Apple Common
C
ry
p
to facili
t
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
Da
v
i
d Aguilar
Makefile: f
i
x defa
u
lt regex sett
i
n
g
s on Darwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David Aguilar
mergetools/
k
diff3: do not us
e
--auto when diffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
D
a
vid
A
guilar
help
.
c:
add
a
compatibi
l
i
t
y
comment to cmd_version()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid
A
guilar
contr
i
b/mw-to
-
git/t/inst
a
ll
-
wiki
.
sh: use a
l
owerc
a
s
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David
A
guilar
contrib/example
s
/g
i
t
-r
e
mote
.
p
e
rl
:
use a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Agu
i
lar
tests: us
e
a lower
c
ase "usage
:
"
st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Dav
i
d A
g
uilar
git-svn: use
a
lowercas
e
"usage
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Ag
u
ilar
Doc
u
mentation/use
r
-m
a
nual
.
txt: use a lo
w
e
r
case
"usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
l
ar
templat
e
s/
h
oo
k
s-
-
update
.
sample: u
s
e a low
e
rcase
"
usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid A
g
uilar
c
ont
r
ib
/
hooks/set
g
itperms
.
p
e
rl:
u
s
e a lowe
r
case
"usa
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contr
i
b/ex
a
m
p
les: use a lowe
r
case "us
a
ge:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
g
uilar
contrib/fast-import/impor
t
-zips
.
py: u
s
e spaces i
n
ste
a
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
co
n
trib/fast
-
import/im
p
ort
-
z
i
ps
.
py: fix broken error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/fast-import:
use a l
o
wercas
e
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
co
n
trib/c
r
edential: use a lowerc
a
se "usage:" st
r
i
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
g
i
t-c
v
simport: use a l
o
wercase "usage:"
s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Ag
u
ilar
git-
c
v
s
import: use a lowercase "us
a
ge:" s
t
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
gi
t
-
cvsexportcommit: use
a
lowercas
e
"usage:" str
i
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-arch
i
mport: use
a lower
c
ase "usage:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
la
r
git-merge-one
-
file: use a
lo
w
er
c
ase "usage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
g
i
t-relink:
u
se a
lowercase "us
a
g
e
:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-svn: u
s
e a lower
c
ase "u
s
ag
e
:
"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
i
t-sh-setup
:
use a l
o
wercase
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t78
0
0: "d
e
f
aults" is no l
o
n
ger a builtin tool
n
ame
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
D
a
v
id Aguilar
t7800: mo
d
e
rn
i
ze tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
D
avid Aguil
a
r
t7800: u
p
date copyright notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Aguilar
d
i
fftool: silence uniniti
a
lized
v
a
ri
a
ble warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David A
g
uilar
p
4mer
g
e: f
i
x printf us
a
ge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David A
g
u
i
lar
d
i
fftool--he
l
p
er: f
i
x
printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David
Aguilar
d
o
c
: genera
t
e
a li
s
t
o
f valid
merge tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
Davi
d
Aguilar
mergetool--lib: add functions for finding available
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguila
r
m
e
rgetool--l
i
b: improve the help text in guess_m
e
rg
e
_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetool--lib:
s
im
p
lify
c
ommand
e
xpressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetools: simpli
f
y
h
ow we handle "vim"
and
"d
e
faul
t
s"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
mergetool
-
-lib: improve show_tool_h
e
l
p() output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
Davi
d
Aguilar
m
e
rget
o
o
ls/vim: remove redundant di
f
f comm
a
nd
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
David Ag
u
ilar
mergetools/p4m
e
rg
e
: Honor $
T
MPDIR for the /de
v
/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David Ag
u
ilar
mer
g
etools/p4merge: Handle "/dev/nu
l
l"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David A
g
uilar
mergetool--
l
ib: A
l
low custom comm
a
nds
t
o overri
d
e built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David
A
g
uilar
g
i
tk:
Re
n
a
me 'tagcontents'
t
o
'cached_tagc
o
ntent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
avid Agu
i
lar
gi
t
k: Tea
c
h "Reread
references" to reload tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
D
a
vid Agu
i
lar
mergetool,difftool: D
o
cument --
t
ool
-
help consistently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
diffto
o
l: Disable --symlinks on cy
g
win
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David
A
guilar
difftool: Handle compar
e
() returnin
g
-1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David
Aguilar
difftoo
l
: Wrap long
lines for
r
eadabil
i
ty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
a
vid Aguilar
d
i
f
f
tool:
C
h
eck all return c
o
des from
c
ompare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Da
v
i
d
A
g
u
ilar
difftool
:
Handle find
i
n
g
mer
g
etools/ in a path
w
ith
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Aguilar
difftool:
U
s
e
s
y
mlin
k
s
when diffing aga
i
n
s
t the worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
ifftool: C
a
l
l th
e
temp
d
ir
e
c
t
ory
"
gi
t
-diff
t
o
o
l"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Ag
u
ilar
d
if
f
to
o
l: Move option
val
u
es into a h
a
sh
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
i
d
Agu
i
l
a
r
difft
o
o
l: Eliminate global variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
A
guila
r
difftoo
l
:
Simplify print_tool_he
l
p()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t7800: Te
s
t di
f
ftool
p
ass
i
ng argument
s
to
diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
mergeto
o
l:
P
rovi
d
e an emp
t
y
fil
e
when ne
e
d
ed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David
A
guila
r
Mak
e
fil
e
: Improve comp
i
ler he
a
de
r
de
p
e
ndency
c
heck
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
Aguilar
mer
g
eto
o
ls/meld: Use
'--output'
when ava
i
l
able
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Aguilar
me
r
g
etool--lib
:
Ref
a
ctor
too
l
s into separate files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
A
guilar
m
ergetool
-
-lib: Make style consistent
w
i
t
h
git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
di
f
ftool--helper: Make
style consistent
w
ith git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Aguil
a
r
t/
t
7503-pre-
c
ommit-ho
o
k
.
sh: Add G
I
T_PREFIX
te
s
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
avid Agu
i
lar
gi
t
-mergetool-
-
lib: Make vimdiff retain the curr
e
nt
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git: Remove handli
n
g for
GIT
_
PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David
A
g
uilar
setup: Provi
d
e GIT_PREF
I
X to bu
i
lt-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Dav
i
d Aguila
r
s
u
bmodule sync: Upd
a
te "submodu
l
e
.
<name>
.
u
rl"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
mer
g
etool:
Skip au
t
ores
o
l
ved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
D
avid Ag
u
ilar
Documentati
o
n: Explain gi
t
-
mergetool's use of
t
e
mpor
a
ry
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
D
a
vid
Aguilar
M
a
k
efi
l
e: Remove usage o
f
deprecated Python
"
has
_
key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Agu
i
l
a
r
difft
o
ol: Fix '--gui' wh
e
n diff
.
guitool is unconfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David A
g
ui
l
ar
t7800-diff
t
ool
.
sh: Test merg
e
t
ool
.
promp
t
fal
l
bac
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Agui
l
a
r
difftool: Upd
a
te copyright notices t
o
list ea
c
h
ye
a
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David
Aguilar
difftool: Use ev
a
l to expan
d
'--extcm
d
' ex
p
ress
i
ons
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difftool: Add '-x' and as an a
l
ias for '--ex
t
cmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t7800-difftool
.
s
h: Simpli
f
y
t
he --
e
xtcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Aguilar
git-diff
.
txt: Link to git-diff
t
ool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
diff
t
ool:
Allow specifying unc
o
nfigur
e
d
commands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
d
i
fftool--helper: Remove use of
the GIT
_
MERG
E
_TOO
L
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
d
i
fftool--h
e
lpe
r
:
Upda
t
e
c
o
pyright and
remove dis
t
ract
i
ng
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
git
-
d
ifftool: Add '-
-
g
ui' fo
r
select
i
ng a GUI
to
o
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
D
avid Agu
i
lar
t7
8
0
0-
d
i
f
f
t
ool:
Set
a
bogus tool for use by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
Dav
i
d Agui
l
ar
help: Do not
unnecessarily
l
o
ok for a repository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Ag
u
ilar
s
ubmodul
e
.
c
: Squelch a "use before ass
i
gn
m
en
t
"
warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
i
d
Aguilar
diff:
g
enerate pretty
f
ilenames in
prep_temp_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Ag
u
i
l
ar
compat
:
a
dd a basename() compa
t
i
bility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat:
ad
d
a m
k
s
temps(
)
compatibility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Agu
i
la
r
Add gi
t
-replace
t
o
.
gitignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
D
a
v
i
d Aguilar
mer
g
etool-
-
l
ib: add s
u
ppo
r
t
f
or
araxis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David Aguila
r
merg
e
tool--lib: spec
i
alize diff options
f
or em
e
rge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
Da
v
id
Ag
u
ilar
m
e
r
geto
o
l--lib
:
simplify API usage by removin
g
more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
ui
l
ar
difft
o
ol/mergetool: refa
c
to
r
comma
n
d
s
to
u
s
e git-mergetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
u
i
lar
mer
g
eto
o
l: us
e
$(
.
.
.
) instead
o
f `backt
i
cks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
g
uila
r
bash
completion: add git-difft
o
ol
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id
A
guilar
difftool: add
s
upport for a dif
f
tool
.
prompt
config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: add var
i
ous
gi
t
-di
f
ftool tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
difftool
:
m
o
v
e 'g
i
t-difftoo
l
'
o
u
t of co
n
tr
i
b
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difft
o
ol: add
a
-y
s
hortcut for --no-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
a
r
difftool: use pe
r
l built-in
s
when t
e
sting for msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
i
l
ar
difftool: remove the b
a
ckup
f
i
l
e
feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
A
guilar
diff
t
ool: remove
m
erge op
t
ions for
o
p
e
n
diff, tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next