repo.or.cz
/
git
/
raj.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
tests: introduce test_ln_s_add
2013-05-09
David Aguil
a
r
m
ergetools/kdiff3: do not use -
-
auto when diff
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
D
a
vid A
g
uilar
h
e
lp
.
c:
a
dd
a co
m
pati
b
ility c
o
mment to cmd_version()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid A
g
u
ila
r
c
o
ntrib/mw-to-
g
it/t/install-wiki
.
s
h
:
u
se a lowerc
a
se
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id A
g
uilar
contr
i
b/exa
m
ples/git
-
remote
.
perl: use
a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David
A
guil
a
r
tes
t
s: use a lowercase "u
s
age:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguil
a
r
git-svn:
u
s
e
a
lowe
r
cas
e
"usage:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
D
o
cumentat
i
on/u
s
er
-
m
anual
.
txt: use
a
lowercase "u
s
a
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guil
a
r
templates/ho
o
ks--update
.
s
a
mple: use a
low
e
rca
s
e "u
s
age
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d
A
g
uilar
contrib/hooks/setgitperms
.
perl: us
e
a lowercas
e
"usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
contrib
/
examples: u
s
e a lowerc
a
se "usa
g
e:"
strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
contrib
/
fas
t
-import/import-zips
.
p
y
: use spaces in
s
tead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
c
ontrib/f
a
st
-
i
m
port/import-
z
ips
.
p
y
: f
i
x brok
e
n e
r
ror
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
contrib/fas
t
-import
:
use a
l
o
wercase "
u
sage:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
contrib/credential: use a lowe
r
c
a
se "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
i
t-cvsimp
o
rt
:
use
a
lowercas
e
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cvsimport: use a lowercase "usage:
"
strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
i
t-cvs
e
xpo
r
tcommit: use
a
lowerc
a
se "u
s
age
:
" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-archimport:
u
se a low
e
rcas
e
"u
s
a
g
e
:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
i
d
Aguilar
gi
t
-merge-one-file: use a lowercas
e
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
git-relink: use a lowercase "usage:"
str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguil
a
r
git
-
svn: use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
gi
t
-sh-set
u
p:
u
se
a
lowerc
a
s
e
"usage
:
"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
D
a
vid Aguilar
t780
0
: "defa
u
lts" is no long
e
r a bui
l
tin t
o
o
l
n
a
m
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David A
g
ui
l
ar
t
7800: mode
r
n
i
z
e
te
s
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David Aguil
a
r
t7
8
00
:
update cop
y
right notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Aguilar
d
ifftoo
l
: silence uninitialize
d
variabl
e
warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Ag
u
i
lar
p4me
r
ge: fi
x
p
r
i
ntf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
difftool--he
l
per:
fix p
r
intf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
Davi
d
A
guilar
d
o
c: generate a list of valid
merge tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David
A
guilar
mergetool--lib:
add function
s
for
fin
d
in
g
availa
b
le
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetoo
l
--li
b
: improve the
h
e
lp text in guess_merg
e
_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetool--lib: simplify command expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Agu
i
la
r
mergetools: simplify how we handle
"
v
im" and
"
de
f
aults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
Dav
i
d Aguilar
mergetoo
l
--lib:
imp
r
ove sh
o
w_tool
_
help()
o
utput
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Agui
l
ar
mergetool
s
/vi
m
:
r
e
m
ove redunda
n
t diff command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
Davi
d
Agu
i
lar
mergetools/p4merge: H
o
nor $TMPDIR for
t
h
e /dev/
n
u
l
l
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
Da
v
i
d
Aguilar
merget
o
ols/p4m
e
r
g
e: Handle
"
/dev/nul
l
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
Dav
i
d A
g
uilar
mergetool--lib: Allow c
u
stom com
m
ands to override b
u
i
l
t-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: R
e
name
't
a
gcontents' to 'cached_tag
c
ontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: T
e
ac
h
"R
e
r
e
ad references" to reloa
d
tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
Da
v
id Aguilar
me
r
getool,difftoo
l
: Docume
n
t
-
-tool-help
c
o
n
s
i
s
t
ently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David
A
g
uilar
diffto
o
l: Dis
a
ble
-
-syml
i
nks on cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David
Aguilar
di
f
ftool: Han
d
le
compare() retur
n
in
g
-1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
dif
f
tool:
W
rap long lin
e
s for readabi
l
it
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
avid Ag
u
ila
r
difftool:
Check a
l
l r
e
t
urn codes from
c
ompare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Agui
l
a
r
di
f
ftool: Handle findin
g
mergetools/ in a path wi
t
h
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool:
Use
s
ymlinks
w
hen diffing agai
n
st the workt
r
ee
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Call the t
e
mp
dire
c
tory "g
i
t
-difftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
Aguilar
dif
f
tool: Move option
v
alues into a ha
s
h
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agui
l
ar
difftool: El
i
mina
t
e
g
lobal var
i
ables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Simp
l
ify
p
r
i
n
t_tool_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t7800: Test difftool passing arguments to
d
iff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
mergetool: Provide an empt
y
file when ne
e
d
ed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David A
g
u
i
lar
Makefile:
Imp
r
ove
compile
r
hea
d
er dependency check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
avid Aguilar
me
r
ge
t
ools/meld: U
s
e '--output' when a
v
ailable
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d
Aguilar
mergetool--lib: Re
f
a
c
tor
tools i
n
t
o
separat
e
f
i
les
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
avid A
g
u
ilar
merget
o
ol--lib:
M
ake style
c
on
s
istent wi
t
h
g
i
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Agu
i
lar
diffto
o
l--helpe
r
:
M
ake
st
y
le consistent
w
ith
git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t/t7503-pre-commit-hook
.
sh: Add GIT_PREFIX
t
ests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Ag
u
ilar
g
i
t-mergetool--lib: Make
v
imdiff
retain the
c
urrent
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git: Remove handling f
o
r
G
IT_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
id A
g
uilar
setup: Provide GIT_PREFI
X
to built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Agui
l
ar
submodu
l
e sync
:
Up
d
ate "submodule
.
<name>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Ag
u
ilar
merg
e
tool
:
Skip autoresolved
p
a
ths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David A
g
uila
r
Documentat
i
on: Exp
l
ain git-m
e
rgeto
o
l's use of temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
Davi
d
Ag
u
ilar
Makef
i
l
e
: Re
m
ove usage of deprecated Pyt
h
o
n "ha
s
_
k
ey
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David A
g
uilar
d
i
f
ftool: Fix '
-
-gu
i
'
w
hen diff
.
g
uitool
is un
c
on
f
igured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
D
avid Agui
l
ar
t7800
-
dif
f
tool
.
sh: Test
m
ergetool
.
prompt f
a
l
lba
c
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
Davi
d
A
g
uilar
difftoo
l
: Update cop
y
r
ight
n
ot
i
ces to list
ea
c
h y
e
ar
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Ag
u
ilar
dif
f
tool: Us
e
eva
l
to expand
'--extcmd'
e
x
p
ressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
d
i
fftool: Ad
d
'-x' and as an alias for '
-
-extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Ag
u
il
a
r
t78
0
0-
d
ifftool
.
sh: Sim
p
lify the --extcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David A
g
u
i
l
ar
git-diff
.
t
x
t
: Link to gi
t
-di
f
ftoo
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
Agui
l
ar
difftool: A
l
low specifying
unconfigure
d
commands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David A
g
uil
a
r
difftool--helper: Remove
u
s
e
o
f
the GIT_
M
ERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
A
g
u
i
l
a
r
d
i
fftool--helpe
r
: Up
d
ate copyright and remove distra
c
tin
g
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David A
g
u
i
lar
git-difftool: Ad
d
'--gu
i
' for selecting a G
U
I tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David
Aguilar
t78
0
0-difft
o
ol: Set a bogus tool
for use
by te
s
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
Dav
i
d Aguilar
h
e
lp:
Do not
u
nne
c
ess
a
rily look for a repos
i
tory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
submodule
.
c: Sque
l
ch a "use
befor
e
a
s
s
ignment"
wa
r
ning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
diff: gener
a
t
e pretty filenames in prep
_
t
e
mp_bl
o
b
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
Ag
u
ilar
com
p
a
t: ad
d
a basename()
comp
a
tibi
l
ity fun
c
tion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Aguilar
compat
:
add a m
k
stemps
(
) co
m
pa
t
i
bili
t
y
function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Agu
i
lar
A
dd git
-
re
p
l
a
ce to
.
gitignor
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Ag
u
ilar
mergetool--lib: add support
for arax
i
s
merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David A
g
u
ilar
merget
o
ol--li
b
: special
i
z
e
dif
f
op
t
ions
f
or
e
m
erge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David
A
gu
i
lar
mergeto
o
l--lib:
s
implify API usage by removing more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diffto
o
l/mergetoo
l
: refactor command
s
t
o use gi
t
-me
r
getoo
l
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
A
g
u
ilar
me
r
g
etoo
l
: u
s
e $(
.
.
.
) instead
of `backtick
s
`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
bas
h
co
m
ple
t
ion: add g
i
t
-
difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
dif
f
t
o
ol: add
s
upp
o
rt
f
or a difftool
.
prompt co
n
fig
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
id Aguilar
difftool: add va
r
i
ous
g
i
t
-difftool t
e
sts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
fftool:
m
o
ve 'git-difftoo
l
' out of contri
b
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftoo
l
: a
d
d a -y sho
r
tcut for --no-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: use
perl
buil
t
-ins when t
e
sting for m
s
ys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
d
ifftool: remove the backup file feat
u
re
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difft
o
ol: r
e
m
o
ve
m
er
g
e
o
ptions for o
p
endif
f
,
tkdi
f
f
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
e
v
er
y
day: use the
d
ashless form of git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
Dav
i
d Aguilar
con
t
rib/difftool: use a separate config namespace for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
Davi
d
Aguilar
contri
b
/d
i
f
f
too
l
: Don'
t
repeat
m
e
r
g
e t
o
ol
c
a
ndidates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next