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 'rr/test-use-shell-path-not-shell' into maint
2012-09-09
Davi
d
Aguilar
gitk: Rename 'tagcontents' to '
c
ached_tagconte
n
t'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Agui
l
a
r
gitk: Teach "R
e
read
r
eferences
"
to reloa
d
t
a
gs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
D
a
v
id
A
gu
i
l
ar
t7800: Test
di
f
ftool passing arguments t
o
dif
f
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
Dav
i
d Ag
u
ila
r
mergetoo
l
: Provi
d
e an empty file when
ne
e
ded
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
D
avid Agu
i
l
a
r
Makefile: Improve co
m
piler header dep
e
n
denc
y
check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
uilar
me
r
g
e
tools/meld: U
s
e '--output' when availab
l
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
uilar
merget
o
ol--lib: Refactor tools into separate files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
a
v
i
d Aguilar
mergetool--lib: Make
s
ty
l
e consisten
t
w
i
th git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
i
d Aguilar
d
i
f
f
tool--helper: Make style c
o
n
sis
t
ent
with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
D
avi
d
Ag
u
ilar
t
/
t7503-pr
e
-com
m
it-
h
ook
.
sh: Add GIT
_
PREFIX tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
i
d Aguilar
g
it-mergetool--lib: Mak
e
vimdif
f
reta
i
n th
e
current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
id Aguilar
git: Remov
e
h
a
n
dli
n
g f
o
r GIT_PRE
F
IX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Agu
i
lar
s
e
tup: Provide GIT_
P
REFIX to built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David A
g
uilar
submo
d
ule sy
n
c: Update "submodul
e
.
<name>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
mergetool: Skip autoresolve
d
paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
D
o
cume
n
tati
o
n: Explain
g
it-merge
t
o
o
l's
u
se of temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David Agui
l
ar
Makefile: Remove usage of deprecated Python "
h
as_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
Davi
d
Aguilar
diffto
o
l:
Fix '--gui' when diff
.
guitool is unconfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
Davi
d
Aguilar
t
7
8
0
0-difftool
.
sh: Test mer
g
etool
.
prompt
f
allback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
Davi
d
Ag
u
ilar
difftool
:
Update
c
opyri
g
ht
notices to lis
t
each y
e
a
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
avid Aguilar
difftool: Use eval to ex
p
an
d
'--ext
c
md' expression
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Agui
l
ar
difftool: Ad
d
'-x' a
n
d as
a
n
a
lias for '--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
avid Aguila
r
t7800-difftool
.
sh: Si
m
p
l
i
f
y the
-
-extcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
Aguil
a
r
gi
t
-diff
.
txt:
L
i
n
k
to git-diffto
o
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
A
g
u
ilar
difftoo
l
: Allow spec
i
fy
i
ng
u
nconf
i
gured
c
ommands wit
h
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
d
i
fft
o
ol--helper: Remove u
s
e of the GIT
_
MERGE
_
TO
O
L
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
A
g
u
ilar
diffto
o
l--
h
e
l
p
er: Update
c
opyri
g
h
t
a
nd
remo
v
e
d
istrac
t
ing
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Da
v
i
d
Agu
i
lar
git
-
d
i
fftool: Add '--gui' for selecting a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Da
v
id Aguilar
t7800-difftool: Set a bogus tool for use by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Agu
i
la
r
help: Do not unnec
e
ssarily loo
k
for a repos
i
tory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Ag
u
ilar
submodul
e
.
c: Sq
u
elch a "use bef
o
re assignmen
t
"
wa
r
ning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Agu
i
lar
diff:
g
e
nerat
e
pretty fil
e
names in prep_temp_bl
o
b()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Aguilar
compat: a
d
d a basename() compati
b
ility functi
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
A
guilar
compat: add a mks
t
emps() compa
t
ibi
l
ity
function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Agu
i
lar
Add git-re
p
lace to
.
giti
g
nore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
D
avid Aguilar
mergetoo
l
--
l
ib: add supp
o
rt for araxis
m
e
rg
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David Aguilar
m
erg
e
tool
-
-
l
ib: spe
c
ialize diff opti
o
ns for emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David
Agui
l
ar
merg
e
tool--lib: simplify
API
u
sage b
y
r
em
o
ving more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
g
uilar
difftool/merge
t
ool: re
f
actor co
m
mands
to u
s
e g
i
t-merge
t
ool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
m
e
r
getool: use $(
.
.
.
) instead of `ba
c
kticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vi
d
Aguilar
bash completion: add
git-diff
t
ool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguil
a
r
diffto
o
l: add support for a diff
t
ool
.
prompt config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uila
r
dif
f
t
o
ol: add v
a
rious git
-
difftool
t
ests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
fftool: move 'git-
d
ifftool' out of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid A
g
uilar
dif
f
tool: add a -y shortcu
t
for --no-pr
o
m
p
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
difftool:
u
se pe
r
l bu
i
lt-ins when tes
t
ing fo
r
m
sys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
difft
o
ol
:
remove the
backup fi
l
e
featur
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
d
iffto
o
l: remove merge options for op
e
ndiff, tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
Dav
i
d Aguilar
e
v
eryday
:
use the dashless form o
f
git-ini
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
Dav
i
d Aguilar
co
n
tr
i
b/difftool:
use a separate config namesp
a
ce for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
contrib/difftool: Don't rep
e
at me
r
ge tool candid
a
tes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
D
avid Aguilar
d
i
f
ftool: put the curs
o
r
on the editable file
f
or Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
dif
f
tool: fix
d
oc
u
men
t
a
ti
o
n
problem
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
D
a
vid
Ag
u
i
lar
co
n
trib: add 'g
i
t difftool'
f
o
r
lau
n
ching comm
o
n merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David
A
gui
l
ar
gi
t
-mergetool: pro
p
erly handle "git mer
g
etool
-
-
f
ilename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David Agui
l
ar
t
ests
:
a
d
d a testca
s
e for "
g
it subm
o
dule sy
n
c"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David
Agui
l
ar
git-submodule: ad
d
"sync" command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
David Agui
l
ar
git-su
b
module: repl
a
ce d
u
pli
c
ated code with a
m
odule_list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[PAT
C
H] gitk: Don't show local changes w
h
en we
ther
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree