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
Merge branch 'cr/git-work-tree-sans-git-dir' into maint
2013-05-21
David Aguil
a
r
i
map-send:
e
l
iminate HMAC de
p
re
c
a
tion warnings o
n
Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
Dav
i
d
Aguilar
c
ac
h
e
.
h: eliminate SHA-1 deprecation warnings
o
n Ma
c
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David
A
gu
i
lar
Makef
i
le: add support for Apple CommonCr
y
pt
o
facility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David Aguilar
Makefi
l
e: fix d
e
fault r
e
g
ex setting
s
on Darwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David Aguil
a
r
mergetools
/
kdiff3: do not use --auto when d
i
ffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
Dav
i
d
A
guil
a
r
help
.
c:
a
dd a compatibility comment
to cm
d
_ve
r
si
o
n()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
contrib/mw
-
to-git
/
t
/
instal
l
-wiki
.
sh: u
s
e a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David
A
guilar
contrib
/
ex
a
m
p
le
s
/g
i
t-r
e
mo
t
e
.
perl: use a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
avid Aguilar
tests:
u
se a l
o
wercase
"u
s
age:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid Aguilar
g
i
t-svn: use a
lo
w
er
c
a
s
e
"
u
sa
g
e:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
i
d A
g
u
i
lar
Documentati
o
n
/
user-manual
.
tx
t
:
u
se a
l
owercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
t
emplates/hooks--update
.
sam
p
l
e
: use a lo
w
ercase "u
s
age
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/hook
s
/set
g
itperm
s
.
perl: use a l
o
wercase "
u
sage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
co
n
trib/exampl
e
s: use
a
l
ower
c
ase
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
c
o
ntrib/fast-impo
r
t/import-zi
p
s
.
p
y
:
use
s
paces i
n
s
t
e
ad
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
con
t
r
ib/fast-import/import-
z
i
p
s
.
py: f
i
x b
r
oken error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
la
r
contrib/fast-impo
r
t: us
e
a
l
o
wercase "usage:" s
t
rin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
u
ilar
contrib/cred
e
n
tial
:
us
e
a lowercase "usage
:
"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
git
-
cvsimp
o
rt: use
a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Ag
u
ila
r
gi
t
-c
v
si
m
port: use a lowerca
s
e "usage:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
git-cvsex
p
ortcommit: use a
low
e
rcase "usage
:
"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
g
i
t-archimport: use a lowercase
"usag
e
:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
g
i
t-merg
e
-one-file: use a l
o
wer
c
ase
"
usage:" s
t
r
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-rel
i
nk: use
a lowercase "us
a
ge:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
i
t-svn: use a lowercase "
u
sage:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
git
-
sh-set
u
p: use a
l
owercase "
u
sage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
D
avid Aguilar
t7800: "def
a
ults" is no longe
r
a builtin too
l
name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David A
g
uila
r
t7800: modernize tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David Aguilar
t78
0
0: update cop
y
right notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
D
avid Aguilar
difftool:
s
il
e
nce uninitialized
v
ar
i
abl
e
wa
r
ning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
p4merge: fix printf usa
g
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguila
r
difft
o
ol--he
l
per:
f
ix print
f
u
s
a
ge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David A
g
uilar
do
c
: generate
a lis
t
of valid mer
g
e tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
a
vid A
g
uilar
m
e
rgetool--li
b
: a
d
d fun
c
tions fo
r
finding avail
a
ble
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
avid
Aguilar
mergetool--l
i
b: im
p
rove the help text in guess
_
merg
e
_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Davi
d
Aguilar
mergetool--lib: s
i
mplify command expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
avid Aguil
a
r
m
e
r
g
etools
:
sim
p
li
f
y how we handle "vim" a
n
d "default
s
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
m
e
rgetool-
-
lib: improv
e
s
h
ow_
t
ool_help()
output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
merget
o
ols/vim:
remo
v
e
redundant diff
command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
D
a
v
i
d
Aguilar
mergetoo
l
s/p4me
r
ge:
H
ono
r
$TMPDIR fo
r
the /dev/nul
l
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
Da
v
id Aguilar
mergetools/p4merge: Handle "/dev/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
mergetool-
-
l
i
b: Al
l
ow custom commands to overri
d
e
built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Renam
e
'tagconten
t
s' to '
c
ached_tag
c
ontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David
Aguilar
g
itk: Teach "Reread references"
to re
l
oad
tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
Dav
i
d Aguilar
mergetool,difft
o
ol: Document --tool-he
l
p
consist
e
ntly
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Da
v
id
A
g
uilar
difftool: Disa
b
le --symlinks on
c
y
gwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Ag
u
ila
r
d
i
f
ftool: Handle compa
r
e() returning -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Da
v
i
d Agui
l
ar
di
f
fto
o
l:
Wra
p
long lin
e
s for read
a
bil
i
t
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David A
g
uilar
dif
f
tool:
C
he
c
k all r
e
turn
co
d
es fr
o
m compare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
avid Agui
l
ar
diffto
o
l:
H
andle
f
inding
m
ergeto
o
ls/
i
n a
p
ath with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
A
g
uilar
dif
f
t
o
ol
:
Use symlinks when
di
f
f
i
ng against the worktr
e
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d A
g
u
ilar
d
ifft
o
ol
:
Call t
h
e temp directory
"
git-difftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguila
r
difftool: Move option va
l
ues into a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
A
guilar
diff
t
ool: Eliminate global variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguil
a
r
difft
o
ol: Simplif
y
print_tool_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Agui
l
ar
t
7800: Test d
i
fftoo
l
p
a
ssing argu
m
ents
to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
Dav
i
d Aguilar
m
ergetool: Provide an em
p
ty fi
l
e
when needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
Makefile: Improv
e
c
o
mpiler header depend
e
ncy check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
merge
t
ool
s
/meld: Use
'
-
-
ou
t
put' when available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
avid Agu
i
l
a
r
mergetool
-
-lib: Refactor tools i
n
to separate files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
me
r
g
etool--lib: Make s
t
yl
e
consistent with
git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
avi
d
Aguilar
difftool--hel
p
er: M
a
k
e
st
y
l
e consistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t/t750
3
-pr
e
-commit-hook
.
sh: Add GIT_
P
REFIX te
s
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Dav
i
d Aguilar
git-mergetool--lib: Make vimdiff retain the current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
a
v
i
d Aguilar
g
it: Remove handling for GIT_
P
REFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Davi
d
Aguila
r
setup: Pro
v
id
e
GIT_PREFIX
to built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Aguil
a
r
s
ubmodu
l
e sync: Update "subm
o
dule
.
<na
m
e>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
D
a
vid Ag
u
ilar
m
ergetool: Skip aut
o
r
e
s
olved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David
Agui
l
ar
Do
c
umentation: Explain git-merget
o
o
l
'
s
use of tempo
r
ary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
Dav
i
d Aguilar
Mak
e
file: Remov
e
us
a
ge
o
f
deprecated
Pyth
o
n "has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
D
a
vid Aguilar
diffto
o
l: Fix
'--gui' when diff
.
guitool
is u
n
configur
e
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
D
avid Aguilar
t78
0
0-difftool
.
sh
:
Test mergetool
.
p
r
o
mpt fal
l
back
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Ag
u
i
lar
difft
o
ol
:
Upd
a
te
c
opyright notices
to list each year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difftool: U
s
e eval to ex
p
and '--extcmd' expressi
o
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
Aguilar
diffto
o
l: Add
'
-x' an
d
as an alias for '--e
x
tcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Agu
i
la
r
t7800
-
d
i
f
f
t
o
ol
.
sh: Simplify
t
h
e --extcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
i
d
Aguilar
git-diff
.
txt
:
Lin
k
t
o
git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
d
ifftool: Allow specifying unco
n
fig
u
red comman
d
s with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Aguila
r
difftool--helper: Remove use of the GIT_MERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vi
d
A
g
uilar
d
ifftool--
h
e
lper: U
p
date copyright and remov
e
distracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Da
v
id Aguilar
git-difftool: Add '--gui
'
fo
r
selec
t
i
ng
a GUI to
o
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David
Aguilar
t7800-dif
f
tool:
S
et a bogu
s
tool for
u
se b
y
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
D
av
i
d Aguilar
hel
p
: Do not unnecessa
r
ily
l
o
o
k f
o
r
a
rep
o
sitor
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
submodule
.
c: Sq
u
elch a "u
s
e before assignment
"
warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
diff
:
gener
a
te pretty
f
ilenames in prep_tem
p
_b
l
ob(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid
Agu
i
l
ar
compat: a
d
d a
b
asena
m
e()
c
ompa
t
i
bili
t
y f
u
nc
t
ion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
v
id Aguil
a
r
comp
a
t: add a mks
t
emps() compatibility f
u
n
ction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguila
r
Add git-replace to
.
gi
t
ignor
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
me
r
get
o
o
l
--lib: add
support for
ara
x
is me
r
ge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David Aguilar
m
e
r
getool--lib: specialize diff options for
e
m
e
rge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
Da
v
id Aguilar
mer
g
etool--lib
:
s
im
p
l
i
fy
API usage by
r
emoving more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguil
a
r
difft
o
ol/m
e
rgetool: r
e
factor commands to use git-mergetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
m
er
g
et
o
ol: use
$
(
.
.
.
) in
s
tead
of
`
backticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
i
l
ar
bash compl
e
tion: add
git-diff
t
ool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
difftoo
l
: add suppo
r
t
f
o
r a difftool
.
prompt config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diff
t
ool: add va
r
ious git
-
di
f
fto
o
l test
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
l
ar
dif
f
t
ool:
m
ove 'gi
t
-difftool' out of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid A
g
uilar
d
iffto
o
l: a
d
d a -y shortcu
t
for --no-p
r
ompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
d
ifftool: use
p
e
r
l bu
i
lt-
i
n
s
wh
e
n testing for
m
sys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
f
f
tool: rem
o
ve the
ba
c
ku
p
file feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next