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 'ph/pull-rebase-detached' into maint
2012-10-11
David Ag
u
i
l
ar
merge
t
o
ols/p
4
merge: Handle "/dev/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David A
g
uilar
me
r
geto
o
l-
-
lib: Allow c
u
stom
c
ommands to override built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
g
i
tk: Rena
m
e 'tag
c
o
n
tents'
t
o
'
c
ach
e
d_t
a
gcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Teach "Reread ref
e
rences" to r
e
load tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
D
avid Aguilar
me
r
getool,difftool: Document --tool-help cons
i
stently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
vid Aguilar
dif
f
tool:
Disable --sym
l
in
k
s on
cy
g
win
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
vid Ag
u
ila
r
difftool: H
a
n
dle compare() r
e
turni
n
g
-
1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
vid Aguil
a
r
difftool: Wrap long lines for readability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Dav
i
d Aguil
a
r
di
f
ftool: Che
c
k all
retu
r
n codes from comp
a
re()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Da
v
i
d Aguilar
difftool: H
a
ndle fin
d
ing mergetools/
in a path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
Ag
u
i
l
ar
d
i
ff
t
o
o
l:
U
se symlinks
w
hen diffi
n
g agains
t
the work
t
ree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
Agui
l
ar
diffto
o
l: Call the
t
emp di
r
e
ctory "gi
t
-di
f
ftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
A
gu
i
lar
d
i
fftool: Move
option values in
t
o a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
Agu
i
la
r
difftoo
l
: Elimin
a
te
g
lobal
v
ariables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
diffto
o
l
: Simplify print_tool_
h
elp()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t7800:
Te
s
t d
i
f
ftool
p
a
ss
i
n
g arguments to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David A
g
uila
r
merget
o
ol:
P
rovid
e
an empty file when
ne
e
ded
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
Makefile: Im
p
rove
c
ompile
r
hea
d
e
r
depe
n
d
e
ncy check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Aguilar
merg
e
tools/meld: Us
e
'
-
-ou
t
put' whe
n
available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Aguilar
merge
t
ool--lib: R
e
factor tools into separate
files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Aguilar
mer
g
e
to
o
l--lib: Make style consistent
wi
t
h git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Aguila
r
dif
f
tool--helper:
Make
s
tyle consistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t/t7503-pre-commit-ho
o
k
.
sh: Add GIT_PREFIX tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
id Aguilar
g
it-mergetool--l
i
b
:
M
ake v
i
md
i
ff re
t
ain the
c
urrent
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
avid
A
guilar
g
it: Remove handling for GI
T
_P
R
E
F
IX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
s
e
t
u
p
: Provide G
I
T_
P
REFIX to built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
sub
m
odule sync:
U
p
d
ate "submodule
.
<name>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
D
avid A
g
uilar
m
erget
o
ol: Skip a
u
toresol
v
ed
paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
D
a
vid Aguilar
Do
c
umentation: Explain git
-
mergetool'
s
u
s
e
o
f
temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
D
avid
A
gu
i
lar
Makefile
:
Remove us
a
ge of deprecated Pytho
n
"has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
D
a
vid Aguilar
di
f
fto
o
l:
F
ix '--gui' w
h
en d
i
f
f
.
guitoo
l
is unconfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
D
a
vid Agu
i
la
r
t
7800-dif
f
tool
.
sh:
T
est
m
ergeto
o
l
.
prompt
fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
Da
v
id Aguilar
difftool: Update
c
opyright
notices to list e
a
ch year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Agui
l
a
r
difft
o
ol: Use eval to expand '
-
-extcmd' expr
e
ssi
o
ns
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
Aguilar
diff
t
ool: A
d
d '-x' and as an alias for '-
-
ext
c
md'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t780
0
-difftoo
l
.
sh: S
i
mplify the --e
x
tcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
git-diff
.
txt:
L
i
nk to git-d
i
fftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Aguilar
difftoo
l
:
Allow spe
c
ifying unconfi
g
u
r
ed com
m
an
d
s wi
t
h
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
dif
f
tool--helper: Re
m
ove
use of
the GIT_MERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
Ag
u
ilar
difftool-
-
helper: Update co
p
yr
i
ght and remove distracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
D
avid Aguilar
g
it-difftool
:
Add '--gui' for se
l
ecting a GUI too
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t7800-difft
o
ol: Set a bogus tool for
u
s
e
by t
e
st
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David
Ag
u
ilar
h
e
lp: Do not unnecessa
r
i
l
y look for a repository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Agui
l
ar
submodule
.
c: Squ
e
lch a "use before ass
i
gnment"
w
a
rning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
d
iff: generate pre
t
t
y filenames in
prep_temp_b
l
ob(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguil
a
r
c
o
m
pat:
add a basename() com
p
atibility f
u
ncti
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compa
t
: add
a
mkstemps() compatibility
f
unc
t
ion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d
A
guilar
Add git-replace to
.
gi
t
igno
r
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Ag
u
ilar
mer
g
e
to
o
l--l
i
b: add
support for araxis me
r
ge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David Ag
u
ilar
mergetool--lib: spec
i
alize diff options for e
m
e
r
ge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
D
avid
Aguilar
mergetool--lib: simplify API
u
sage
b
y removing m
o
re
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
ifftool/me
r
g
e
t
o
ol:
r
e
fact
o
r commands
t
o
use
git-
m
erge
t
ool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d
Aguilar
mergetoo
l
: use
$
(
.
.
.
) in
s
tead o
f
`backti
c
k
s
`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
b
as
h
completio
n
: add git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool:
a
dd support for a
d
ifftool
.
prompt config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
av
i
d Aguilar
dif
f
tool
:
add v
a
r
ious
g
it-difft
o
o
l
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d A
g
uilar
difftool: mo
v
e 'git-difftool' ou
t
o
f
cont
r
ib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
f
fto
o
l: ad
d
a
-y s
h
o
rtcut for
--no-p
r
ompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
g
u
ilar
difftool
:
us
e
pe
r
l bui
l
t-ins when testing for ms
y
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
di
f
fto
o
l: re
m
ove
t
he backup
file
feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
d
iff
t
o
ol: remove me
r
ge
o
ptions
f
or
o
pendiff,
tk
d
iff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
Da
v
id Aguil
a
r
everyday: use t
h
e dash
l
ess f
o
rm
o
f git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
Dav
i
d
A
g
ui
l
ar
contrib/dif
f
t
ool:
u
se
a
separate c
o
nfig namespace for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
D
avid Aguil
a
r
contrib/diff
t
ool: Don't
repeat merge tool ca
n
d
idates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Agu
i
lar
difft
o
ol:
put
the
cursor on the
e
ditabl
e
file fo
r
Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
D
a
vid Aguila
r
di
f
ftool: fi
x
do
c
u
menta
t
ion problem
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David Ag
u
ilar
contrib
:
add 'gi
t
difftool' for launching c
o
mmon merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
Da
v
i
d
Aguila
r
gi
t
-merg
e
tool: properly handle
"git mergetool -- f
i
lename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
tests:
add a
t
estc
a
se for "git submodul
e
sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
Da
v
id Agui
l
ar
git-su
b
m
o
dule
:
a
dd "sync
"
command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
D
a
v
id Aguilar
g
it-submo
d
ule: re
p
l
a
ce du
p
licated code
with a modul
e
_
l
ist
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David
Aguilar
[PAT
C
H
]
gitk: Don'
t
s
how lo
c
a
l changes
w
hen we there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree