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
remote-hg: get rid of unused exception checks
2013-05-09
Davi
d
Ag
u
ilar
merge
t
ools/kd
i
ff3:
d
o n
o
t use --auto when diffi
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
Dav
i
d Aguilar
help
.
c: add
a
compati
b
i
lity c
o
mment to c
m
d_version()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguil
a
r
contrib
/
mw-to
-
git/t/install-wiki
.
s
h
:
u
se a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id
Aguilar
contrib/examples/git-remote
.
perl: use a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
tests: use a
l
owe
r
c
ase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguila
r
git
-
svn:
use a lower
c
ase "us
a
ge:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
i
d Agu
i
lar
Docume
n
tatio
n
/user-manual
.
t
x
t: use a lower
c
as
e
"u
s
age
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
template
s
/h
o
oks--
u
p
date
.
s
a
m
ple: use a lo
w
erc
a
se "usa
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contri
b
/hooks/set
g
itperms
.
perl: use a l
o
wercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d A
g
uilar
co
n
trib/examples: u
s
e a
l
o
w
ercase
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid
Ag
u
ilar
contr
i
b/fast-import/import-zip
s
.
p
y: u
s
e space
s
instead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
contrib/fast-impor
t
/import-zip
s
.
py: fix broken e
r
ror
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
c
o
nt
r
ib/fa
s
t-import: use a lowercase "usage:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d
Agui
l
a
r
c
o
ntrib/credential: use a l
o
wercas
e
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
git-cvsimport: use a lo
w
er
c
as
e
"u
s
age:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguila
r
gi
t
-cvsim
p
ort:
u
se a lowe
r
ca
s
e "usag
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
g
i
t
-
cvse
x
portcomm
i
t: use a low
e
rcase "us
a
g
e:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
git-archimpo
r
t: use
a lowercase "us
a
ge:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
g
i
t-merg
e
-one-file: use a lower
c
ase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-relink: use a lower
c
ase "u
s
ag
e
:
" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
i
t-svn: use
a
lowerca
s
e
"usage:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-sh-setup: us
e
a low
e
rcase "u
s
a
g
e
:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t7800: "defau
l
ts" is no
lon
g
er
a builtin tool n
a
me
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t7800
:
modernize tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David Ag
u
il
a
r
t
7800: upd
a
te co
p
yr
i
gh
t
n
oti
c
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
D
a
v
id Aguil
a
r
difftool: silence
u
n
i
niti
a
lized variable
w
ar
n
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
p4m
e
r
g
e
: fix
p
rintf
u
s
age
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
Dav
i
d
Aguilar
d
i
f
f
tool--
h
elper:
f
ix p
r
intf us
a
ge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
Dav
i
d Aguilar
doc
:
generate
a
li
s
t o
f
valid merge tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Ag
u
ila
r
m
e
rge
t
oo
l
--
l
ib:
add functions f
o
r finding a
v
ailable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
m
e
rge
t
o
o
l-
-
lib: improve t
h
e help tex
t
in
g
uess_mer
g
e_tool
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Da
v
id Agu
i
lar
m
e
rgetool--lib: simpl
i
fy comma
n
d expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetools:
s
implify how we handle "vim"
a
nd "defaul
t
s"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David
Aguilar
merg
e
tool--lib
:
improve show_tool_
h
elp() output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
mergeto
o
l
s/vim: remove redun
d
ant diff
command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
David Aguilar
merge
t
ool
s
/p4merge: H
o
nor $TMP
D
IR for the /dev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
D
avid Aguil
a
r
m
e
rgetoo
l
s/p
4
merge: Handle
"/de
v
/n
u
ll"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
D
avid
A
guilar
mer
g
etool--l
i
b: A
l
low custom comman
d
s to
o
ve
r
ride buil
t
-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguil
a
r
gitk:
R
ename 'tag
c
ontents' t
o
'cached_tagcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Teach "Reread refer
e
nces" to relo
a
d tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
Dav
i
d Aguilar
merget
o
ol,diffto
o
l: Document --tool-
h
elp con
s
istently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
vid
Agui
l
ar
difftoo
l
: Disable --s
y
m
l
i
n
ks on cygwi
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Da
v
id Aguil
a
r
difftool: Handle compare()
re
t
urning -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Dav
i
d Aguilar
difftool: Wrap l
o
ng lines for readability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David
Aguilar
difftool: Check
a
l
l return code
s
from
c
ompare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David
A
g
ui
l
ar
d
i
fftool:
H
andle findi
n
g mergetools/ in
a path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
diffto
o
l: Use
s
ymlin
k
s when d
i
ffing against the worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Call t
h
e temp direct
o
ry "g
i
t-d
i
ffto
o
l
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftoo
l
: Move option values int
o
a
h
ash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool
:
Elimi
n
ate global variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
Aguilar
diff
t
ool: Simpl
i
fy print_tool_he
l
p
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
D
avid Agu
i
l
a
r
t
7
8
0
0: Test diff
t
ool
pass
i
ng argu
m
ents to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
merget
o
o
l: Prov
i
de an empty file when neede
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David
A
g
u
ilar
Ma
k
efile
:
I
mp
r
o
ve com
p
i
ler
h
eader
d
ependency
c
hec
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
merge
t
ools/meld: Use '--out
p
u
t
' when
a
v
ailabl
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetool
-
-lib:
Refa
c
tor t
o
o
l
s
int
o
separate files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d
Agui
l
ar
mergetool-
-
lib: Make style c
o
n
s
i
s
tent with gi
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
Agui
l
ar
difftool--helper: Mak
e
style consistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Agu
i
l
a
r
t/
t
7503
-
pre-commit
-
hook
.
s
h
: A
d
d GIT_PR
E
F
I
X tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Ag
u
ilar
gi
t
-mergetool--lib:
M
ake
v
imdi
f
f retain th
e
current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git: Re
m
ove hand
l
ing fo
r
GIT
_
P
R
EFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguila
r
setup: P
r
ovide GIT_PRE
F
IX to built-
i
ns
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David
A
guilar
su
b
module sync:
Update "submo
d
ule
.
<na
m
e>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Aguila
r
m
e
rgetool: Skip autoresolved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
D
avid Aguil
a
r
Documentat
i
on: Explain gi
t
-mergeto
o
l's us
e
o
f
temp
o
rary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
Dav
i
d
Ag
u
ilar
M
ake
f
il
e
:
R
emove usa
g
e of depre
c
at
e
d Python "has
_
key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Aguil
a
r
diffto
o
l
: Fix '
-
-g
u
i' when diff
.
guit
o
o
l is unconfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
Da
v
id
Agu
i
l
ar
t7800
-
difftool
.
sh: Test merg
e
tool
.
prompt fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David A
g
uilar
di
f
ftool: Update copy
r
i
ght n
o
t
i
ces to list e
a
ch yea
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
diff
t
ool: Use
ev
a
l to
e
xpand '-
-
extcm
d
' expr
e
ssions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
d
ifftool:
A
dd '-x' and as an alia
s
for '--extcm
d
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t7800-diffto
o
l
.
sh: Simplif
y
the --extcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
g
it-diff
.
t
xt: Link to g
i
t
-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftoo
l
:
Allow speci
f
yi
n
g
un
c
on
f
ig
u
red commands
w
ith
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
d
iffto
o
l
-
-hel
p
er: Remove
u
se of the G
I
T_ME
R
GE
_
TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
Aguilar
diffto
o
l--helpe
r
:
Updat
e
cop
y
right and
r
emove distracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Dav
i
d Aguilar
git-
d
ifftool:
A
dd '--gui' for selec
t
i
n
g a G
U
I too
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Ag
u
ilar
t7800-difftool: S
e
t a bogus
tool for u
s
e by t
e
sts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Aguil
a
r
h
e
lp: Do not unnecessa
r
ily
look
f
or a reposi
t
ory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
su
b
module
.
c
:
S
quelch
a
"u
s
e before assi
g
nment" warni
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
dif
f
: ge
n
e
r
ate pretty filenames in pr
e
p
_temp_blob
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: a
d
d
a
basename
(
) com
p
atibility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
co
m
pat: add
a
mkstemps() co
m
pa
t
ibility func
t
ion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id A
g
ui
l
ar
Add
g
it-re
p
l
a
c
e
to
.
g
itignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
Dav
i
d A
g
uilar
mer
g
e
t
oo
l
-
-lib: add support for araxis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David Aguila
r
mergetool--lib: speciali
z
e diff
o
pti
o
ns for emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
me
r
getoo
l
--lib: s
i
mplify API u
s
age
b
y removi
n
g
m
ore
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
l
ar
d
i
fftool/mergetool: r
e
factor commands to
u
s
e
git-mergetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Agu
i
la
r
mergetool: use $(
.
.
.
) inste
a
d of
`
b
a
ckticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bash completion: add git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: add support for a difftool
.
prompt
c
onfig
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool
:
a
d
d
various git-
d
ifftool tes
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
difft
o
ol: move '
g
it
-
difft
o
ol' out of c
o
ntri
b
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool
:
ad
d
a -y sho
r
tcut for --no-p
r
ompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
A
guilar
difft
o
ol: use
p
erl built-
i
ns w
h
en
testing for msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: remove the bac
k
up file featur
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: remove
merge opt
i
ons for opendiff, tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
Da
v
id Aguila
r
everyday: use the dashless form o
f
g
it-in
i
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David
A
g
u
ilar
c
ontrib/dif
f
t
ool:
u
se a separate config nam
e
space for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
contrib/difftool
:
Don't repea
t
merge tool c
a
ndidates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next