repo.or.cz
/
git
/
jnareb-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
Aguil
a
r
git-cvsex
p
ortcom
m
it: u
s
e
a
lowercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-archimport: u
s
e a lowercase "usage:"
stri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
git-
m
erge-on
e
-file: use a lowercase
"
usage:
"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-
r
elink: use
a
lowercase "usage:
"
st
r
i
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
git-
s
vn:
use a lowercase "usage:" st
r
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Ag
u
il
a
r
git-sh-setup: us
e
a lowercase "
u
s
age
:
" strin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
D
avid Aguilar
p4merge: fix
prin
t
f usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Agu
i
lar
difft
o
ol--helper: fix p
r
i
n
tf usa
g
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
Dav
i
d A
g
uilar
doc: g
e
nerate a
list of valid me
r
ge t
o
ols
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
Davi
d
A
g
uila
r
mergetool--lib: add functions for finding
a
vailable
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
Dav
i
d Aguila
r
mergeto
o
l--lib: improve t
h
e help
text
in guess
_
merge_tool()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguil
a
r
m
e
rgetool--lib: simplify command expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
Davi
d
Agu
i
lar
merget
o
ols:
s
im
p
lify how we handle "v
i
m
"
and "def
a
ults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Agu
i
l
ar
me
r
get
o
ol--
l
ib: improve show_tool_help() o
u
tput
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David
Agui
l
ar
mergetools/vim:
r
emove
r
edundant
d
iff comma
n
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
David Aguilar
merg
e
t
o
ols/p4merge: Honor $TMPDIR for the /de
v
/n
u
ll
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
D
a
vid Agui
l
ar
merg
e
t
o
o
ls/p4me
r
ge: Ha
n
dle "/
d
e
v
/null"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
Davi
d
Aguil
a
r
mergetool--lib
:
A
llow custom com
m
ands to ov
e
rr
i
de built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Ag
u
ilar
gitk
:
Rename 'ta
g
contents' t
o
'cached_tagconte
n
t
'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Teac
h
"
Rer
e
ad re
f
e
renc
e
s"
t
o r
e
load ta
g
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
David
Agu
i
lar
mergetool
,
dif
f
t
o
o
l: Documen
t
--t
o
ol-help consi
s
tently
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: D
i
sable --symlinks on cyg
w
in
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
di
f
ftool: H
a
ndle com
p
are() r
e
turning -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
d
iffto
o
l
:
Wrap long lines for read
a
bilit
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftool: C
h
eck al
l
re
t
urn codes from c
o
mp
a
re()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David A
g
ui
l
ar
d
iffto
o
l: Handle fi
n
din
g
merg
e
to
o
l
s/ in a path with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
A
guila
r
di
f
ftool
:
Use sym
l
inks w
h
en dif
f
i
ng against the worktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
i
fft
o
ol: Ca
l
l the temp di
r
ectory
"git-difftool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool:
M
ove option va
l
u
e
s
into a hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Ag
u
ilar
difftoo
l
:
Elimina
t
e global
variables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
Aguilar
difftool
:
Simplify print_
t
ool_h
e
lp()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
Da
v
id
A
gu
i
la
r
t7800: Test difftool passin
g
argumen
t
s to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David Agu
i
lar
m
e
rge
t
ool: Provide an emp
t
y f
i
le when needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
D
a
v
id Aguilar
M
a
k
efile: Improve compiler header
d
ependency check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d
A
g
uilar
m
e
rgetoo
l
s/meld:
U
se '--o
u
tput' w
h
en available
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David
A
guila
r
m
e
r
getool--li
b
:
Refactor t
o
o
l
s
into
s
eparate files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid Aguilar
m
ergetool
-
-lib: Make
sty
l
e consi
s
ten
t
with gi
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d
A
gu
i
l
a
r
difftool--h
e
lper:
M
ake
style consisten
t
wit
h
git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t
/
t7503-
p
r
e-
c
ommit-hook
.
sh: Ad
d
GI
T
_PRE
F
IX te
s
t
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David
A
g
u
ilar
git
-
merge
t
ool--lib:
Ma
k
e v
i
mdiff retain t
h
e current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
g
i
t: Remo
v
e
han
d
l
ing
f
or GI
T
_PREFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguil
a
r
setup: Provide
G
IT_
P
RE
F
IX to built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David Aguila
r
s
u
b
module sync: Update
"
sub
m
odule
.
<name>
.
u
r
l"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David
Aguilar
mer
g
e
tool
:
Skip au
t
o
r
e
s
ol
v
ed paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David Agu
i
lar
Docu
m
e
ntation: Explain g
i
t-m
e
rge
t
ool's us
e
of
t
e
mporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David A
g
uilar
Makefile
:
Remo
v
e u
s
age of
deprec
a
ted Python "ha
s
_ke
y
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David Aguila
r
difftool: Fix '--
g
u
i' w
h
en diff
.
guitool is uncon
f
i
gure
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
Da
v
id Aguilar
t78
0
0-diff
t
ool
.
sh: Test mergetool
.
prompt fallbac
k
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David Aguil
a
r
d
i
fftool: U
p
date cop
y
right notic
e
s to list each ye
a
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid Aguilar
difftool: Use ev
a
l to expand
'
-
-e
x
tcmd' expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Ag
u
ilar
difftoo
l
: Ad
d
'-x' and as
a
n
a
lias for '--extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
Aguilar
t780
0
-difftool
.
sh:
S
im
p
lify the --extcm
d
test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
g
i
t
-diff
.
txt: Link to gi
t
-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David A
g
uilar
difftool: Allow speci
f
ying u
n
confi
g
ured
comma
n
d
s
with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
A
guilar
dif
f
tool
-
-helpe
r
: Remo
v
e
us
e
of t
h
e
G
I
T
_M
E
RGE_TO
O
L
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid
A
guilar
d
i
fft
o
ol--h
e
lper:
Update copyright
a
nd r
e
m
ove distractin
g
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
Dav
i
d Aguilar
git-difftool: Add '--gui' for select
i
ng
a GUI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
D
a
vid Aguilar
t
7800-d
i
fftool: Set a b
o
gus t
o
ol for us
e
b
y
tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
Da
v
id Aguilar
help: Do not unnecessaril
y
l
o
o
k
for a re
p
ository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David A
g
uilar
submodu
l
e
.
c: Squelch a "use before assi
g
n
ment"
w
arning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguila
r
diff: generate pretty fi
l
en
a
mes in prep_
t
emp
_
b
lob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vi
d
Aguilar
compat: add a basename() compatibility fu
n
cti
o
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id Aguilar
com
p
at: ad
d
a
mkstemps() compat
i
bility functio
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
A
guilar
Add git-replace to
.
gitigno
r
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
Dav
i
d Aguilar
merg
e
tool
-
-lib: add suppor
t
fo
r
araxis
m
erge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David
Agu
i
lar
m
e
rgetool--
l
ib: speciali
z
e
diff options for emer
g
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
D
avi
d
Agui
l
a
r
mergetool--lib
:
simplif
y
A
P
I
usage by
r
emoving more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
difftool/mergetool: refactor commands
to use git-merge
t
ool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Ag
u
ilar
m
erge
t
oo
l
: use $(
.
.
.
)
i
nstead
o
f `backticks
`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
bash com
p
l
e
t
i
on: add git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
g
u
i
l
ar
d
i
fftool:
a
dd su
p
port for a diffto
o
l
.
prom
p
t config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
av
i
d
Aguilar
difftoo
l
: add vario
u
s gi
t
-difft
o
o
l
t
ests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
dif
f
tool:
move 'git-
d
ifftool'
out
of c
o
n
trib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguila
r
difftoo
l
: add a -y sho
r
tcut
f
or
--no
-
promp
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftoo
l
: use perl built-ins
w
hen testing fo
r
m
sys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
difftool: re
m
ove the backup f
i
le
feature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
difftool:
rem
o
v
e me
r
g
e
options for o
p
endiff, tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Agui
l
ar
everyd
a
y: use th
e
dashless form of
g
it-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David Aguil
a
r
c
ontrib/difftool: u
s
e
a separate con
f
ig names
p
ace for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
c
o
n
trib/difftoo
l
:
Don't repeat m
e
rge tool candidates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David
A
guilar
difftool: put
t
he cu
r
s
o
r
on the e
d
itable f
i
le
f
o
r
Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
Dav
i
d Aguilar
d
i
fftool: fix documentation pro
b
lems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David Aguila
r
c
o
ntrib: add
'
git diff
t
o
ol' for launc
h
ing comm
o
n mer
g
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
D
a
vid
Aguilar
git-mer
g
etool:
pro
p
e
rly han
d
le "git
m
ergetoo
l
--
f
il
e
name"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Aguil
a
r
t
ests: add a
testc
a
se
f
or "git sub
m
odule sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David
A
guil
a
r
g
i
t
-submodule:
add "syn
c
"
c
o
mma
n
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
gi
t
-submo
d
ule:
replac
e
duplic
a
te
d
cod
e
w
i
th a
m
odu
l
e_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[PATCH] g
i
tk: D
o
n't
show local changes when we there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree