repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-cvsexportcommit: use a lowercase "usage:" string
2013-02-24
David A
g
u
i
lar
git-cvsexportcommi
t
:
use a
lowercase
"
usage:" s
t
r
i
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
i
d
Agui
l
ar
git
-
archimport: us
e
a lowercas
e
"usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
g
it-merge-one-file: use a
l
owercase "usage:" s
t
ring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
gi
t
-
relink: use
a
lowercase "usage:
"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguil
a
r
g
i
t-svn: use a lo
w
e
r
case "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-sh-
s
etup: use a lo
w
e
r
ca
s
e "usag
e
:
"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
p4m
e
r
g
e
:
fix printf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Aguil
a
r
d
i
f
ftoo
l
--helper
:
fix printf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
doc: gen
e
rate a list of valid merge tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David A
g
uilar
merg
e
t
o
ol
-
-lib: add function
s
for f
i
nding available
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
Da
v
id Agui
l
ar
merget
o
ol--
l
ib:
i
mprove t
h
e h
e
lp text in guess_merge_tool()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid
Aguilar
mergeto
o
l-
-
lib
:
si
m
pli
f
y
command expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
m
ergetools: simpl
i
fy ho
w
we
h
and
l
e "vim" and "defaul
t
s
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David
Aguilar
mergetool--lib: im
p
rove
s
how_tool_help() outp
u
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
Dav
i
d Aguilar
mergeto
o
ls/v
i
m: remove redundant diff command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
David A
g
uilar
mergetools/p4merge: Honor
$
TMPDIR for the /dev/null
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
Da
v
id Agui
l
ar
m
ergetools/p4merge:
H
a
n
dle "/dev/null"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
mer
g
etool--li
b
:
Allow cust
o
m com
m
ands to
override built-
i
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
Davi
d
Ag
u
ilar
g
i
t
k
:
Rename 'tagcontents' to 'cached_tagcont
e
n
t'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
D
avid A
g
u
i
l
ar
gitk: Teach "Reread refer
e
nces" to reload tag
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
Da
v
i
d Aguilar
m
e
r
ge
t
o
ol,dif
f
tool: Doc
u
ment
-
-tool-help con
s
ist
e
ntly
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguil
a
r
d
i
fft
o
ol: Disable --symlinks on cygwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Agu
i
l
ar
d
i
f
ftool: Han
d
le c
o
mpare() returni
n
g
-1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Agui
l
ar
d
i
ff
t
ool: Wrap long li
n
es
fo
r
r
e
a
dability
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difft
o
ol: Che
c
k
a
ll return codes from co
m
pare()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Agu
i
lar
d
ifftool: Handle
f
indi
n
g mergetools/ in
a
p
ath with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
A
guilar
d
ifftool: Use
sy
m
l
inks w
h
en d
i
ffing agai
n
st t
h
e worktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
iff
t
o
ol: Ca
l
l the temp di
r
ect
o
ry "gi
t
-diff
t
o
ol"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Ag
u
ilar
di
f
f
t
o
o
l: Move
o
ption values into a hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
uilar
difftool:
E
limina
t
e gl
o
ba
l
va
r
iables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Ag
u
ilar
difftool:
Simplify
p
rin
t
_tool_help()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t780
0
:
Test difftool p
a
ssing arguments t
o
di
f
f
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
merget
o
ol: Provide an empt
y
file when needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
D
avi
d
A
g
uila
r
M
a
kefile: Impr
o
ve compiler hea
d
er dependency check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id A
g
u
ila
r
mergeto
o
ls
/
me
l
d: Use '--output' when available
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetool-
-
lib: Refact
o
r tools into separ
a
te files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
merge
t
ool--l
i
b: Make style consistent
with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
d
if
f
t
o
ol--h
e
lper: Ma
k
e style consisten
t
with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Agu
i
l
a
r
t
/
t
7
503
-
pre
-
commit-ho
o
k
.
sh: Add GIT_PREFIX tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Davi
d
Agu
i
lar
git-me
r
geto
o
l--lib: Mak
e
vimdiff retain the current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Davi
d
Aguilar
git: Rem
o
ve handling fo
r
GIT_PREFI
X
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Davi
d
Aguilar
setu
p
: Provid
e
G
I
T_PREFIX to built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David Aguila
r
submodule
sync:
Upd
a
te "submod
u
le
.
<name>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
Davi
d
Aguilar
m
ergetool: Skip autore
s
olved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David
Agu
i
lar
Documentatio
n
: Explain git-merget
o
ol's use of temporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
Davi
d
Ag
u
ilar
M
akefile: Remove usage of deprecated Pyt
h
on "ha
s
_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David Ag
u
ilar
difftool: Fix '--
g
ui' wh
e
n diff
.
gu
i
tool is unconfigured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Aguil
a
r
t7800-difftoo
l
.
sh:
T
e
st mergetool
.
p
rom
p
t
fall
b
ack
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
dif
f
tool:
Update copyright notices to
l
i
st ea
c
h year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
Aguilar
difftool: Use eval
to ex
p
and
'
--extcmd'
e
xpressio
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
Aguila
r
difftool: Add '-x' and as
a
n alias f
o
r '--ex
t
c
m
d
'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id Ag
u
ilar
t7800-d
i
ffto
o
l
.
s
h: Simplify the --extcmd t
e
st
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
A
guil
a
r
git-diff
.
txt: Link to git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool:
A
l
l
ow specifyin
g
unconfigured
comma
n
ds wit
h
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vi
d
Agu
i
lar
difftool--helper:
R
emove
us
e
of the GIT_MERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
A
guilar
difftool--helper: U
p
dat
e
c
o
pyr
i
ght and r
e
m
ove
dist
r
act
i
n
g
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
git-difftool: A
d
d
'
--gui' for s
e
lec
t
ing a GUI
tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Ag
u
ila
r
t78
0
0-difftool: Set a
bogus tool f
o
r use by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
Davi
d
A
g
u
i
la
r
help
:
D
o
not unnecessar
i
ly loo
k
f
or a reposit
o
ry
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
D
a
vi
d
A
guilar
submodule
.
c: Squelch a
"
use bef
o
re assignment"
w
arning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
diff: generate
p
retty fi
l
e
n
a
m
e
s
in
p
rep_temp_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguila
r
com
p
at: a
d
d a
basename() compatibilit
y
function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Aguilar
c
o
mpat
:
a
dd a m
k
stem
p
s()
compat
i
bility fu
n
cti
o
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d Aguilar
Add gi
t
-
r
e
place to
.
gi
t
i
g
n
o
re
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
Davi
d
Ag
u
ilar
m
ergetoo
l
--lib: add su
p
port for araxis merg
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
D
a
vid
Agui
l
ar
merget
o
ol--lib: spe
c
ia
l
ize diff optio
n
s for
emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
Davi
d
Aguilar
mer
g
etoo
l
--lib: simplify API
u
sage
b
y
removing more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
diffto
o
l/mergetool: refactor command
s
t
o
use git-mergetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
m
ergetool: use
$(
.
.
.
)
i
n
s
tead o
f
`
b
ac
k
ticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uila
r
ba
s
h completion: add
g
it-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguila
r
difftool: add support for a difftool
.
promp
t
c
o
nfig
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
diffto
o
l:
a
dd various git-difftool
t
ests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
id Agu
i
lar
d
ifftool: move 'git-diffto
o
l' ou
t
of contrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
dif
f
tool:
a
dd a
-
y shortcut for
-
-no-pr
o
mp
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
difftool: use
perl built-ins
when testing for
msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: remov
e
the backup file
f
eature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Agui
l
ar
d
i
fft
o
ol: remove me
r
ge
op
t
i
ons for opendiff, t
k
diff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
Da
v
id Aguilar
e
veryday:
use the dashl
e
ss form of
g
it-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David
Aguil
a
r
cont
r
ib/
d
ifftool: use
a
sep
a
rate co
n
fig nam
e
space
for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
D
avid
A
g
uilar
cont
r
i
b
/diff
t
ool
:
Don't
r
epeat merge tool cand
i
dates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Agu
i
lar
difftool: put th
e
cursor on
the editable file fo
r
Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
Davi
d
Agui
l
ar
d
i
f
ftool: fix docum
e
ntation problems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David Aguilar
contrib: add
'
g
it diff
t
ool' for launchin
g
common m
e
r
ge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Aguila
r
git-mergetool: properl
y
handle "git
m
ergetoo
l
-- fil
e
name"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Aguila
r
tests:
a
dd a test
c
ase for "git
s
ubmodule
sync
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David Aguilar
git-sub
m
odu
l
e
: add "sync" command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
D
a
vid Aguilar
g
it-submodule
:
replace
duplicated code
w
ith a module
_
list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[PA
T
CH] gitk: Don'
t
show local changes when we th
e
re
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree