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
help.c: add a compatibility comment to cmd_version()
2013-04-16
David
A
g
ui
l
ar
help
.
c: add
a
compatibi
l
ity com
m
e
nt
t
o c
m
d_version()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
contrib/m
w
-
to-git/t/
i
nstall-wiki
.
sh: use a lowercase
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Ag
u
ilar
c
o
ntrib/examples/git-
r
emot
e
.
perl: use a lowe
r
case
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
Dav
i
d Agui
l
a
r
tests: u
s
e
a
l
owercase "usag
e
:
"
stri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id Agui
l
ar
git
-
svn: use a low
e
rcase
"
usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
Docume
n
tation/user-manual
.
tx
t
: u
s
e a
lowercase "us
a
ge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
t
e
m
plates/h
o
oks-
-
upda
t
e
.
sample: use a
lo
w
e
r
ca
s
e
"
u
sa
g
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid
A
guilar
cont
r
i
b
/hook
s
/
s
e
tgi
t
perms
.
perl:
u
se a lo
w
ercase "us
a
ge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
contr
i
b
/
ex
a
mples: use
a
lowercas
e
"usage:"
s
tring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
contri
b
/fast-impor
t
/
i
mp
o
rt-zips
.
py: use spaces
in
s
tead
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d A
g
ui
l
a
r
co
n
t
r
ib/fast-import/imp
o
rt
-
zips
.
py: fix bro
k
en e
r
ror
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
id A
g
uilar
contrib/fast-import: use a
l
owercase "usag
e
:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/credential: us
e
a
l
ower
c
ase "usage:" str
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid A
g
u
i
l
a
r
git-cv
s
import:
use
a
lowercase
"
us
a
ge:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
git-cvsimpor
t
: use a lowerca
s
e "usa
g
e:
"
st
r
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
g
it-cvsexpo
r
tcommit:
use a lower
c
ase "u
s
ag
e
:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Agu
i
lar
git-archimport
:
use a lowercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguil
a
r
git-merge-one-file
:
u
s
e a
lowerc
a
se "usage:" stri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguil
a
r
git
-
relink:
u
se a
l
owerc
a
se "usage
:
" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
g
it
-
svn: use a l
o
w
ercase "usage:
"
st
r
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-
s
h
-s
e
tup: u
s
e a lowerca
s
e "u
s
age:
"
s
t
ri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
Davi
d
A
guilar
p
4merge: f
i
x printf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David
A
g
uila
r
di
f
ftool--h
e
lper: fix pr
i
ntf
u
sage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
D
avid Agui
l
ar
doc: generat
e
a
list o
f
v
a
lid merge tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
Da
v
id Aguilar
mergetoo
l
--lib: add function
s
f
o
r
fi
n
ding available
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Agui
l
a
r
merg
e
tool--lib:
i
m
prov
e
the help text in guess_merge_tool
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
D
avid
A
g
uilar
m
e
rgetoo
l
--li
b
: simplify command ex
p
ressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguil
a
r
mer
g
etools: simpl
i
fy
h
ow w
e
handle "vim
"
and
"
defaults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
D
avid Aguilar
mergetool--lib: improve sh
o
w_tool_help() output
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
Davi
d
Agu
i
lar
m
erge
t
ool
s
/vim:
re
m
ove redund
a
nt diff comman
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
D
a
v
id
A
guilar
mergeto
o
ls/p4
m
erge: Honor $TMPDIR
f
or
the /dev/nu
l
l
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
David Aguilar
mergetools/p4merge: Handle "/dev/n
u
ll"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David Agui
l
ar
mergetool--lib: Allow custom co
m
m
an
d
s t
o
override built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
Dav
i
d Aguilar
gitk:
Rena
m
e
'tagcontents' to 'cached_tagcontent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Agu
i
l
ar
gitk: Teach "R
e
r
e
ad
r
e
ferences" to re
l
o
a
d
ta
g
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
Da
v
id Aguila
r
mergetool,dif
f
tool: Document --
t
ool-he
l
p
c
onsistently
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Dav
i
d
A
guilar
dif
f
tool:
Di
s
able
-
-sym
l
inks on cygwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftoo
l
: H
a
ndle comp
a
re(
)
r
e
turning -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: Wrap long l
i
nes f
o
r readabil
i
ty
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David
A
g
u
i
lar
diffto
o
l: C
h
eck all return codes f
r
om c
o
mpare()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David
A
guila
r
difftool: Handle findi
n
g mer
g
et
o
ols/ i
n
a
path with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
ifftool: Use sy
m
links when diffing against the worktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Agui
l
ar
d
if
f
tool: Call
t
he temp directory "git-diff
t
ool
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
diffto
o
l: Move option value
s
i
nto a hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Agu
i
lar
difftool: Eliminate global
v
ariables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d Aguilar
difftool: Si
m
pl
i
fy prin
t
_tool_he
l
p()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t7800: Test dif
f
tool
p
assing arguments to di
f
f
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David
A
gu
i
la
r
mergetool: Pro
v
i
de an
empty file when needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David
Aguilar
Makefile:
Improve com
p
il
e
r
header dep
e
n
d
ency c
h
eck
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mer
g
etool
s
/meld: Use '--outp
u
t
'
when
a
vailable
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Ag
u
ilar
mergetool--lib: Refac
t
or
tools in
t
o separat
e
f
i
l
e
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
avid Aguilar
m
erget
o
ol
-
-lib: Mak
e
style
consistent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
avid Aguilar
diff
t
ool--helper: Make s
t
yle
consistent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t/t
7
50
3
-pre-co
m
mit-hook
.
s
h
: A
d
d GIT_PREFIX test
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
g
i
t-mergetool--lib
:
Ma
k
e vimdiff ret
a
in the curren
t
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
avid Agu
i
lar
g
it: Remov
e
h
andling for
G
IT_PREFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
avid Aguilar
setup:
P
r
ovide GI
T
_PREFIX to built-
i
ns
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
D
a
vid Aguilar
submodule sy
n
c: Update "su
b
modul
e
.
<na
m
e>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David Aguil
a
r
mergeto
o
l: Ski
p
a
u
tor
e
solved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
Da
v
id
Aguilar
Documen
t
ation: Explain git-merg
e
tool's use of tem
p
o
r
ary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
Da
v
i
d
Aguilar
Makefile: Remove usage of de
p
r
e
c
ate
d
Python "has_ke
y
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
D
a
vid Aguilar
difftool: Fix '--gui'
when diff
.
guitool is unconfig
u
red
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
Da
v
i
d
Agu
i
lar
t7800-difftool
.
s
h
:
Test mergetool
.
p
r
ompt fallba
c
k
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David Agui
l
ar
difftoo
l
:
Update co
p
yright notices to l
i
st each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
i
d
Aguila
r
difftool: Use eval to expand '--e
x
tcmd
'
expressio
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguil
a
r
difftoo
l
: Add '-x' an
d
as
an alias for '--extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Agui
l
ar
t78
0
0-d
i
f
f
tool
.
sh: Simplify the --ex
t
cmd
test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Ag
u
ilar
git-diff
.
txt: Link
t
o git
-
diffto
o
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difft
o
ol: A
l
low specifying u
n
confi
g
ured commands with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
Ag
u
ilar
d
i
fftool
-
-
helper:
R
emove use
of t
h
e
G
IT_M
E
RGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguila
r
difftool--helper: Update copyright
a
nd remove distra
c
tin
g
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Agu
i
lar
git-d
i
fftool: Ad
d
'--
g
ui' for
s
e
l
ectin
g
a GUI t
o
ol
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t
7
800-diffto
o
l:
Set a bo
g
us tool for use by tes
t
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
Dav
i
d
A
g
ui
l
ar
help: Do not unnecessarily look fo
r
a
repo
s
itory
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Ag
u
ilar
submodule
.
c: Squ
e
lch a "use before
a
ssignment" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
Aguilar
dif
f
:
ge
n
erate pretty fil
e
names in prep_temp_bl
o
b()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
co
m
pat: add a basename()
c
ompa
t
ib
i
l
ity functio
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: a
d
d
a mkstemps() compat
i
bility f
u
nction
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id Aguilar
A
d
d
g
it-replac
e
to
.
gitignor
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
mergetool--lib:
a
dd support for araxis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David
A
gu
i
lar
mergetool--lib:
specialize
d
i
ff options for emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
D
a
vi
d
Aguilar
me
r
g
e
tool--lib: simplify
A
PI usage by removing
m
ore
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id A
g
u
i
lar
di
f
f
tool/merget
o
ol: refa
c
tor
commands to use
g
it-mergetoo
l
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
mergetool: use
$
(
.
.
.
) ins
t
ead of `backticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
bash completion: add
g
it-diffto
o
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
id Aguilar
difftool: add support for a difftool
.
prom
p
t
config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
id Aguilar
diff
t
ool: add various git-difftool tes
t
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
d
iff
t
ool
:
move
'g
i
t
-difftool' out of co
n
trib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: add a -y short
c
ut
f
or --no
-
p
rompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
iffto
o
l: use perl
b
u
il
t
-
i
ns when test
i
ng
for ms
y
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
difftool:
remove t
h
e backup file feature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vi
d
Ag
u
ilar
difftool:
r
emove merge options for o
p
e
ndiff, tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Aguil
a
r
everyday: u
s
e
t
he dashless form of
g
it-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
Davi
d
A
g
uilar
co
n
tri
b
/diffto
o
l: use a
s
epara
t
e
config namespace f
o
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
D
av
i
d Aguilar
contr
i
b/difftool: Don't repeat m
e
rge to
o
l candidates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
Da
v
i
d Aguilar
difftool: put the cursor
on the e
d
itable file for Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
Da
v
id Aguilar
difftool: fix d
o
cumen
t
ation problems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
Davi
d
A
g
uilar
cont
r
ib: add 'gi
t
difftool'
f
or launching common merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-merge
t
o
ol: properly handle "git me
r
getool -- filename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Agu
i
lar
t
est
s
: add a
t
estcase
f
or "g
i
t subm
o
dule
s
y
n
c"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
next