repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'po/maint-refs-replace-docs' into maint
2012-10-11
Dav
i
d
A
guilar
mergetools/p4merge: Handl
e
"/dev/null
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
D
avid
Aguilar
me
r
geto
o
l-
-
li
b
:
Allow custom co
m
mands to override built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
a
vi
d
A
g
uilar
g
itk: Re
n
a
me 't
a
g
c
o
nten
t
s
'
t
o 'ca
c
he
d
_t
a
g
content'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David A
g
uilar
gi
t
k:
Teach
"
Reread
references"
t
o r
e
load tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David
Aguilar
mergetool,difftool: Document --tool
-
h
elp consis
t
en
t
l
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Davi
d
Aguilar
difftool
:
Disab
l
e
--
s
ymlinks
o
n
cy
g
win
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difft
o
ol:
H
andle compare() returning -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
D
a
vid Agui
l
ar
diffto
o
l: Check all return
cod
e
s from compare
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
avid Aguilar
difftool: H
a
ndle finding me
r
ge
t
ools/
in a
p
ath with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguilar
dif
f
t
ool: Use symlinks
when d
i
f
f
ing
a
gainst th
e
work
t
r
e
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Ag
u
ilar
d
i
fftool:
C
al
l
the
t
emp d
i
recto
r
y
"git-difftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
i
fftool:
Move option values
in
t
o a has
h
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Eliminate global variab
l
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid
Aguila
r
difftool: Simplify print_tool_help(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Aguil
a
r
t7800: Test difftool passing
a
r
guments to di
f
f
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
D
avid Aguilar
mergetool
:
P
rovi
d
e
a
n empty f
i
l
e
w
hen needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
D
avid
A
guila
r
Makefile:
I
m
prove compiler header
d
ependency che
c
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
uilar
mergetool
s
/
mel
d
: Us
e
'--output' w
h
e
n
available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
m
erge
t
o
ol--lib: Refactor tools
into separate files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d Aguilar
mergetool--li
b
: Mak
e
sty
l
e consistent
with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
uilar
d
i
fftool--h
e
lper: Make st
y
le consi
s
t
ent wi
t
h git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David
Aguil
a
r
t/t7503
-
pre-commit-hook
.
sh:
Add GIT_PREFI
X
t
ests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
a
vid
A
g
uilar
git-merge
t
ool--lib: Make vi
m
diff retain the curre
n
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
i
d
A
g
uilar
git: Re
m
ove handlin
g
f
or GIT_P
R
EFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David
Agui
l
a
r
setup: Pro
v
ide
G
IT_PR
E
FI
X
to built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David A
g
uilar
submodu
l
e
s
ync
:
Update "submodule
.
<n
a
me>
.
ur
l
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Ag
u
ilar
m
er
g
etoo
l
: Skip
au
t
oresolved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
D
a
vid Agui
l
ar
Docume
n
t
a
tion: E
x
plain git-m
e
rgetool's use of temporar
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David Agu
i
lar
M
a
kefile: Remo
v
e us
a
ge
of deprecat
e
d Python "has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
D
a
vid Aguilar
d
i
fftool: Fi
x
'--gui
'
when diff
.
g
u
it
o
ol is unc
o
nfigure
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
D
a
vid Aguilar
t7800-di
f
ftool
.
sh: Test mergetool
.
p
r
ompt fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
D
a
vid
Agu
i
lar
diffto
o
l: Update copyr
i
ght notices to list each
year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
Ag
u
ilar
difftool: Us
e
e
val to e
x
pand '--extcm
d
' expressi
o
ns
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
i
d
Ag
u
i
l
ar
difftool:
A
dd
'-x' and as an alias
f
or '--
e
x
t
cmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
avid Aguila
r
t
7
80
0
-difftool
.
s
h
: 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-diff
t
ool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Agu
i
lar
d
ifftool: Allow specifying u
n
c
onfig
u
red
c
o
mmands wi
t
h
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
i
d Aguilar
difftool--helper: Remove use of the G
I
T
_MERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
v
id Aguilar
d
ifft
o
ol--he
l
p
e
r: Update copyright and r
e
mo
v
e di
s
t
r
a
cting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Dav
i
d A
g
uil
a
r
git-difftool: Add '--gui' for selecti
n
g a G
U
I tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Dav
i
d
A
guila
r
t7800-difftool
:
S
e
t
a bogus tool f
o
r u
s
e
by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
D
avid Aguilar
help: Do
not unnecessarily look fo
r
a repository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
Da
v
id
A
guilar
submodule
.
c:
S
quelch a
"
us
e
before assi
g
nment" warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
Aguila
r
diff:
genera
t
e
pretty filenames in prep
_
temp_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Ag
u
ilar
c
o
m
p
at:
add a basename() compatib
i
lit
y
fu
n
ction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
comp
a
t: add
a mkste
m
ps() compati
b
ility f
u
nction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Ad
d
git-replac
e
to
.
gitignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David
A
guila
r
mergetool--
l
ib:
add sup
p
ort for ara
x
is merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David A
g
uilar
m
e
rgeto
o
l--lib:
s
pecial
i
ze dif
f
o
p
t
ions for emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Agui
l
a
r
mergetool--li
b
:
s
i
mp
l
ify
API usage by
r
emov
i
ng more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool/mergetool: refactor commands to use
git-m
e
rgetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Agui
l
ar
merge
t
ool: use $(
.
.
.
) instead of `b
a
ckticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bas
h
completion: add
g
i
t-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
d
ifftool: add
support
for a di
f
fto
o
l
.
prompt
c
o
nfig
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguila
r
d
i
f
f
too
l
: add va
r
ious g
i
t
-dif
f
tool tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
difftool: move 'git
-
difftool' out of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
difftool: add a -y shortcut for --n
o
-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
difftool: use per
l
built-
i
ns when testi
n
g f
o
r
msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
d
i
fftoo
l
: remo
v
e the ba
c
kup fi
l
e feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
gui
l
ar
d
ifftool: rem
o
v
e
merg
e
opti
o
n
s for opendi
f
f, tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
Da
v
id A
g
u
ilar
everyday: use the
d
as
h
le
s
s form
o
f
git-i
n
it
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David
A
guilar
contrib/difftool: use a
s
eparate
config n
a
mespace for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David
A
guilar
cont
r
ib/difft
o
ol: D
o
n
't repeat merge tool ca
n
dida
t
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
diffto
o
l
:
put the c
u
rsor on the editabl
e
file for Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difftoo
l
: fix doc
u
mentat
i
on prob
l
ems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
D
avid
Aguilar
contrib
:
add
'
g
it di
f
ftool' for launch
i
ng com
m
o
n merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David Agu
i
lar
git-mergeto
o
l: prope
r
ly handle "git mer
g
etool -- filename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David
Aguil
a
r
tests: add
a
testcase
for "gi
t
submodule sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
Da
v
id Aguil
a
r
git-submodule: add "sync" command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
D
a
vid Aguilar
git-submodule:
replace dupli
c
ated
code
with a modu
l
e
_
list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David
Aguilar
[PATCH] gitk
:
D
o
n't show local changes when we there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree