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
A
g
u
i
lar
m
e
r
g
etools/p4mer
g
e
: Handle "
/
d
e
v
/
null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
D
a
vid
A
guil
a
r
merge
t
ool--li
b
: Allow cus
t
o
m
co
m
man
d
s
to over
r
ide bui
l
t-in
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gi
t
k: Re
n
a
me 'tagconte
n
ts' to 'cached
_
tagcont
e
nt'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Davi
d
Agu
i
lar
gitk: Te
a
ch "Reread references" to
rel
o
ad
tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David
A
guilar
merg
e
t
o
ol,
d
ifft
o
ol: Documen
t
--
t
ool
-
help consistently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David
A
g
u
i
l
a
r
difftool: Disable --sy
m
l
i
nks on cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
avid Aguilar
difftool: Handle compa
r
e() retur
n
i
n
g
-1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David A
g
u
i
l
ar
difftool: Wrap
l
ong lines for rea
d
ability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Dav
i
d Aguilar
dif
f
t
o
o
l: Check all retu
r
n codes from compare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftool: Ha
n
dle
finding m
e
rgeto
o
ls/
in a path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
av
i
d Agu
i
lar
d
i
fftool:
U
se symli
n
ks when diffing ag
a
ins
t
the worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
Aguila
r
difftool: Cal
l
t
h
e t
e
mp dire
c
t
ory "git-difftoo
l
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agui
l
a
r
difftool: Move option v
a
lues i
n
t
o a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Ag
u
i
lar
diffto
o
l: Eli
m
in
a
te global variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Ag
u
ilar
difft
o
ol: Simpli
f
y print
_
tool_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t7800: Te
s
t difftool pa
s
s
i
ng
a
rguments to
diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
D
a
vid Aguilar
mergeto
o
l: Provide
a
n
em
p
ty file when needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
Makefile: Improve
c
o
m
piler
h
ea
d
er dependency check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
merge
t
ools/meld: Use '-
-
o
u
tpu
t
' when available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetool
-
-li
b
: Re
f
actor to
o
l
s
into
s
e
par
a
te
files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Agui
l
ar
m
e
r
getool--lib
:
Make style consiste
n
t
w
i
th gi
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguila
r
diff
t
ool--
h
elper: Make
style consistent
w
i
th git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t/t7503-pre-comm
i
t-hook
.
sh: Add
GIT_PREFIX
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
id
Aguilar
git-mergetool
-
-lib:
M
a
ke vimdiff re
t
a
i
n
t
h
e current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git: Remove handling for GI
T
_PRE
F
I
X
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguila
r
setup: Provide GIT_PREFIX
to
b
u
ilt-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
submodu
l
e sy
n
c: U
p
date "subm
o
dul
e
.
<name>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
D
a
vid Agui
l
a
r
m
ergetool: Skip au
t
oresolv
e
d
pat
h
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David Aguil
a
r
Docu
m
entat
i
on: Explain git-
m
erget
o
ol's
u
se of tempo
r
ary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David Agui
l
ar
M
a
k
efile: Remove usage
of deprecat
e
d Python "has_k
e
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Aguila
r
difftool: Fix '--gui' when diff
.
guitool is uncon
f
igure
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Agu
i
lar
t780
0
-di
f
ftool
.
s
h
: Test me
r
g
et
o
o
l
.
prompt fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
Da
v
id
A
g
u
ilar
difft
o
ol:
U
p
d
a
te copy
r
ight noti
c
es to
list each year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d
Aguilar
difftool: Use
e
va
l
to
e
x
pan
d
'--extcmd' expression
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid
Agu
i
l
ar
difftoo
l
:
Add '-x' a
n
d
a
s
an
alias for '--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
avid Aguilar
t7
8
00-di
f
fto
o
l
.
sh: Simplify th
e
--extcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Agu
i
lar
git-diff
.
txt: Link to git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David A
g
u
ilar
diff
t
o
o
l: All
o
w specifying unconfigured
c
omm
a
nds with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
dif
f
tool--helper: Remove use of the
G
I
T
_MER
G
E_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d
Aguilar
d
ifftool--hel
p
er: U
p
date copyright and remove dist
r
acting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Davi
d
Aguilar
git-
d
ifftool:
Add '--gui'
f
or
s
e
lecting
a
GUI t
o
ol
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Dav
i
d Aguilar
t7800-difftool: Set a bog
u
s
too
l
for use
by test
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
D
a
vid Aguilar
h
elp: Do not un
n
ecessarily look for a repository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
submodul
e
.
c
: Sque
l
ch
a
"use
b
ef
o
re ass
i
gnment" warn
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
avid Ag
u
ilar
diff: generate pret
t
y fi
l
e
name
s
in prep_temp_blob(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
avid A
g
uilar
compat: add a bas
e
name() compatib
i
li
t
y
function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Ag
u
ilar
compat: ad
d
a mkste
m
ps() compatibility
f
u
nc
t
ion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Aguilar
Add git-re
p
la
c
e
to
.
gitignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
D
avid Aguila
r
mergetool--li
b
:
add
suppor
t
for
araxis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David
A
guilar
mer
g
etool--lib: spe
c
ializ
e
diff options for emerg
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David
Aguilar
mergetool
-
-l
i
b: simplify API
u
sage by
removing more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
id Aguilar
difftool/mergetool
:
refactor co
m
mands to us
e
git-m
e
rgetoo
l
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
mergetool: us
e
$(
.
.
.
) instead o
f
`ba
c
kticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bash completion: a
d
d git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Agui
l
ar
difftool:
a
dd
su
p
port for
a
d
i
fftool
.
p
rompt config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Agu
i
lar
difftool: add vari
o
us git-di
f
ftool tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
dif
f
tool: m
o
ve 'git-
d
ifftool' out of
c
ontrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
d
iff
t
ool: add a -y shortcut for --no-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: u
s
e perl buil
t
-in
s
when testing for
m
sys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguil
a
r
dif
f
tool: re
m
ov
e
the backup file
f
eature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
diffto
o
l
:
remove merge options fo
r
opendiff, tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
Davi
d
Aguilar
everyday: use the dashless for
m
of git-i
n
it
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David
A
guilar
co
n
trib/difftool: use a separate c
o
nfig namespace for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
D
avid Aguila
r
c
o
n
t
r
i
b/diff
t
ool: Don't repeat mer
g
e
t
ool ca
n
di
d
ates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
Dav
i
d Aguila
r
difftool: p
u
t the cursor on the e
d
itable fi
l
e for Vi
m
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Agu
i
lar
difftoo
l
: fix
docu
m
e
n
tation problems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David Ag
u
ilar
c
o
ntrib: add 'gi
t
difftool' for launching com
m
on
mer
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-mergetool: properly handle
"
git m
e
rg
e
tool -- filenam
e
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
D
avid A
g
uilar
t
e
sts: add a testcase for
"
git subm
o
dule s
y
n
c"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
Dav
i
d Aguilar
git-submodule: add "sync"
c
o
mman
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
git-s
u
bmodule: replace duplicated c
o
de
with a mo
d
ule
_
lis
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David A
g
uil
a
r
[PA
T
CH] gitk: Don't
s
how loc
a
l changes wh
e
n we the
r
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree