repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Git 1.8.2.3
2013-05-09
David
Agu
i
lar
mergetoo
l
s/kdiff
3
: do
n
ot use --au
t
o when
diffin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David Aguilar
hel
p
.
c: add a compatib
i
lity co
m
ment to cmd_version()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Dav
i
d Aguilar
contrib/mw-to-g
i
t/t
/
in
s
tall-w
i
ki
.
sh
:
use a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David A
g
u
i
lar
contrib/exam
p
les/git
-
remote
.
per
l
: use a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David
A
guilar
test
s
:
use a l
o
wercase "usage:
"
st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid Aguilar
git-svn:
use
a
lo
w
e
rca
s
e "usage:
"
strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
D
ocumentation
/
u
ser-
m
anual
.
txt: use a lower
c
ase
"
usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid
A
guilar
templates/hook
s
--update
.
sample: use a lowercase "usa
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/hooks/setg
i
t
perms
.
perl: use a
l
o
wercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
i
d
Aguilar
contrib/ex
a
mple
s
: use a lowercase "u
s
a
ge:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
c
ontrib/fa
s
t-import/import-zips
.
py: use spac
e
s instead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contr
i
b
/fast-import/import-zi
p
s
.
py: fix
b
roken err
o
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Agui
l
ar
contrib/
f
ast-import: use a lower
c
a
s
e
"usa
g
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/credential: use a lower
c
a
se "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguil
a
r
git-cvsimport:
u
s
e a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguil
a
r
git-cvsimport:
use a lowercase
"us
a
ge:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
git-
c
vsexportcommit: use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
git-arch
i
m
p
ort: use a l
o
wercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
i
d
A
g
uila
r
git-me
r
g
e
-
one-fi
l
e: use
a
lowercase "usa
g
e:
"
stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
i
d Aguilar
git-relink:
u
s
e
a lowercase "usage:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
g
it-sv
n
: use a lowercase "usage:" s
t
ri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguil
a
r
git-
s
h-setup: use a low
e
rcase "u
s
age:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
p4m
e
rge:
f
ix p
r
in
t
f
u
sage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Agu
i
l
ar
d
ifftool--
h
elper: fix pri
n
tf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Agui
l
ar
doc: generate a lis
t
of val
i
d merge tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Ag
u
ilar
m
ergetool--lib: add functions for finding available
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid
A
g
u
i
lar
mergetool
-
-
l
i
b: improve the help t
e
xt i
n
guess_merge_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Dav
i
d Agui
l
ar
m
e
r
g
etool
-
-lib: simplify command expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David
A
guilar
merg
e
to
o
ls: sim
p
lify how we hand
l
e "v
i
m"
and "defaul
t
s"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
Davi
d
Agu
i
lar
mergetool--l
i
b: improve sho
w
_
t
o
o
l_help
(
)
output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
a
vid Aguilar
mergeto
o
l
s/vim:
remove redun
d
ant dif
f
comman
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
David Aguilar
mergetools/p4merg
e
: Honor $TMPDIR for
the /dev/
n
ul
l
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David Aguilar
mergetool
s
/p4merge
:
Handle "/dev/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David A
g
uilar
merg
e
t
o
o
l
--lib: Allow cu
s
t
o
m
commands to
o
verride
b
uilt
-
ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
a
v
i
d Agui
l
ar
gitk: Ren
a
me 'tagcontents'
t
o 'cached_tagcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David
Ag
u
il
a
r
gitk: Tea
c
h "R
e
read
r
e
f
er
e
nces
"
t
o
r
e
l
o
ad tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
m
erge
t
ool
,
difft
o
o
l: Do
c
u
ment --tool
-
help consistently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguila
r
di
f
ftool: Disab
l
e -
-
symlinks on c
y
gwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
v
id A
g
uilar
difftool:
Ha
n
dle com
p
a
r
e() returning
-
1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguil
a
r
diff
t
oo
l
: Wrap long lin
e
s
f
o
r
readability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Da
v
id Aguila
r
di
f
ftool: Che
c
k all retu
r
n codes from compare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
avid
A
g
uil
a
r
difftool: Handle finding mergetools/ in a pa
t
h wi
t
h
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
dif
f
tool: U
s
e symlinks when diffing aga
i
nst the
w
orktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
v
i
d Aguilar
d
i
fftool: Call t
h
e te
m
p directory "git-d
i
fftoo
l
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id
A
guilar
d
ifft
o
ol:
M
ov
e
optio
n
values
i
nto a
h
ash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
avid Aguil
a
r
difftool: Eliminate
g
lo
b
al v
a
riab
l
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
ifftool
:
Simplify
pri
n
t_tool_he
l
p()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David
A
g
uilar
t7800: Test diff
t
o
ol
pass
i
ng argument
s
to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Aguil
a
r
mergetool: Provi
d
e
an empty fi
l
e when ne
e
d
e
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David Agui
l
ar
M
ake
f
ile: Impro
v
e c
o
mpiler header dep
e
ndency c
h
eck
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
uilar
merg
e
tool
s
/m
e
ld: Use '--o
u
tput' w
h
en available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
A
guilar
mergetool--lib: R
e
factor tools in
t
o separate files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id A
g
u
i
l
ar
mergetool--lib: Make style consistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Agu
i
lar
diffto
o
l--helper: Make st
y
le consistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Ag
u
ilar
t/t75
0
3-pre-
c
ommit-hook
.
sh: Add GIT_PREFIX tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git-mergetool--lib: Ma
k
e
vimdiff retain the cur
r
e
n
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Ag
u
ilar
g
i
t
: Remove handling for GIT_P
R
EF
I
X
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David
A
guilar
setup: Provide GI
T
_PREFIX
t
o
built-
i
ns
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Davi
d
Aguilar
s
u
bmo
d
ule
sync: Upd
a
te
"
submodul
e
.
<
na
m
e>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
Davi
d
Ag
u
ilar
mergetool
:
Skip
auto
r
esolved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David Agui
l
ar
Documentation: Expl
a
in git-mergetool's
us
e
of te
m
p
orary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
Makefile: Remove usage
o
f depreca
t
ed P
y
th
o
n "has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
d
i
fftoo
l
:
F
ix '--
g
ui' w
h
en
d
iff
.
guitool is
u
nconfig
u
red
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
Davi
d
Ag
u
ilar
t7800-difftool
.
sh:
Test merge
t
ool
.
prompt fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
difftool: Updat
e
copyright notices
t
o lis
t
each year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id
Ag
u
ilar
difftool: Use eval to expand '--e
x
tcmd'
expression
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguila
r
d
ifftool: Add
'
-
x
'
and
a
s an alia
s
fo
r
'--extc
m
d
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David A
g
uilar
t
7
800-d
i
fftool
.
sh: Simplify the --extc
m
d test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
git-
d
i
ff
.
txt: Link to git-d
i
fftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Agui
l
ar
dif
f
too
l
: Allow specifying unconfigured
c
ommands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
Aguilar
difftoo
l
--
h
el
p
er: Rem
o
ve use of
t
he GIT_ME
R
G
E_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d Aguilar
difftool
-
-helper: Up
d
ate cop
y
right and remove
dis
t
racting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
D
avid A
g
uilar
git-di
f
ftool: Add '--gui' for s
e
le
c
ting a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Davi
d
Agui
l
ar
t
7
8
0
0-d
i
fftool: Set a bogus to
o
l for
u
se by tes
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
Davi
d
Agui
l
ar
help: Do not unn
e
cessarily lo
o
k for a repository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David
A
guilar
submodule
.
c
: Squelch a "us
e
b
efore assig
n
ment" warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David A
g
uilar
diff:
generate
p
retty filenames in prep_
t
emp_blob(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
A
guilar
compat: add a basen
a
me() compatibility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: add a mkste
m
ps() compatibility func
t
ion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d Agui
l
a
r
A
d
d git-replac
e
to
.
gitign
o
r
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
me
r
getool--lib
:
add s
u
pport for araxis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David Aguilar
merget
o
ol
-
-li
b
: spec
i
a
l
ize
d
iff opti
o
ns for emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
Da
v
id
Aguil
a
r
merge
t
ool--
l
i
b: simplify API usage by removing
m
ore
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool/mergetool: re
f
actor commands
to
use
g
i
t-mer
g
etoo
l
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
mergetool: use $(
.
.
.
) i
n
ste
a
d
o
f `backticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid
A
guilar
bash co
m
pletion: add g
i
t
-
difftoo
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Agu
i
lar
d
ifftool: ad
d
suppo
r
t for a diff
t
o
o
l
.
prompt
c
onfig
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
difftool: ad
d
v
a
riou
s
git-difftool tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
di
f
ft
o
ol: move 'gi
t
-difftool' out
of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Agu
i
l
a
r
difftool
:
add a -y shortcut for --no
-
prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d
Aguilar
difftoo
l
:
u
se
p
erl b
u
ilt-ins
w
hen
testing for msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guil
a
r
difftoo
l
: remove the ba
c
k
up file
f
eature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Agui
l
ar
diffto
o
l: r
e
move merge opt
i
o
ns f
o
r op
e
ndiff, tk
d
if
f
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
everyday: use
th
e
das
h
less for
m
of git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
contrib/diff
t
o
o
l
:
use a s
e
para
t
e config n
a
mespace for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
cont
r
ib/
d
ifftool: Don
'
t repe
a
t merge tool candida
t
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
D
a
v
id
Aguilar
difft
o
ol: put
the cursor on th
e
e
d
itable file for V
i
m
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difft
o
ol: fix documen
t
a
tion problems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
D
a
v
i
d Ag
u
ilar
contrib: add
'
git difft
o
ol' for la
u
nching common merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David Aguil
a
r
g
i
t-mergetool: pro
p
e
r
ly handle
"
g
it me
r
g
etool -
-
filename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next