repo.or.cz
/
git
/
gitweb-caching.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-merge-octopus: use (merge-base A (merge B C D E...)) for stepwise merge
2008-07-30
Junio C Hamano
git-me
r
ge-octopus:
u
se (m
e
rge-base
A
(merge B C D E
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-30
Junio C Haman
o
merge-base-many: ad
d
trivi
a
l tests based
o
n the docu
m
entation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-30
Junio C
H
aman
o
documentation: merge
-
base: expla
i
n "git mer
g
e-base
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-30
Chris
t
ia
n
Coude
r
merge-b
a
se: t
e
ach "git
merge-b
a
se"
t
o
drive underly
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
Alex Riese
n
M
ake use o
f
stat
.
ctime configurab
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
Chr
i
s
t
i
an C
o
uder
me
r
g
e
-base:
die wit
h
an e
r
ror messag
e
if
n
o
t
passed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
Junio C Hamano
t
7
001:
f
ix "git m
v
" test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
J
unio C
H
amano
D
o
cumentat
i
on:
clarify w
h
a
t
is
shown in "git-ls-fil
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
S
teffe
n
Prohaska
run-command (Windows)
:
R
u
n dashless "
g
it <cmd>"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
Steffe
n
Prohaska
Refactor, adding prepare_git_cmd(con
s
t char *
*
argv)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
Olivier Marin
bu
i
ltin
-
verify-tag:
f
i
x -v option parsi
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
Junio C H
a
mano
ls-tree d
o
cumentation: enhance notes on s
u
bdirec
t
o
ry
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-28
Ju
n
io C Hamano
A
l
low
in
s
ta
l
lin
g
in t
h
e
traditio
n
al way
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-28
Junio C Hamano
Allow bui
l
ding without
a
ny g
i
t installed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-28
Jeff King
init: handle
e
mpty "t
e
mplate"
p
a
r
ame
t
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Junio C H
a
m
a
no
GIT 1
.
6
.
0-
r
c1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Petr B
a
udis
git
-
mv: Kee
p
moved index
entries inact
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Petr Baudis
git-m
v
: Remove dea
d
code branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
S
hawn O
.
Pearce
fsck: Don't re
q
uire
t
mp_obj_ file names are 14
b
ytes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Johannes
S
chindelin
Avoid chdir() in list_commands_in
_
dir()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Lars Hjemli
builtin-branch: f
i
x
-v for --[
n
o
-
]merged
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
L
a
rs Hj
e
mli
bui
l
tin-branch
:
f
a
c
tor
o
ut merge_fil
t
er
mat
c
hing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
L
a
rs
Hj
e
mli
builtin-bra
n
ch: remove
du
p
licate
d
code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
B
j
ö
rn
S
te
i
nbrink
rev-parse: Add support for the ^! a
n
d ^@ syn
t
ax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Junio C Hamano
make sure parsed wildcard refspec
e
nds with slash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Jakub
N
a
rebski
gitweb: More about how gitweb ge
t
s 'owner'
of r
e
p
osit
o
r
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Jona
t
h
a
n Nieder
t
603
0
(
bisec
t
): work around M
a
c
OS X "ls"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Cesar Ed
u
ardo Barros
Docume
n
tation
/
gi
t
-
submodule
.
txt:
f
i
x d
o
ubl
e
d word
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Lee Marlow
bash c
o
m
pl
e
tion: Add com
p
letion f
o
r
'git help'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Anders
Melchiorse
n
Do
c
ument
a
tion:
f
i
x diff
.
externa
l
example
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Thomas Rast
bash
completion
:
Ad
d
l
ong opt
i
ons for '
g
it desc
r
ibe'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Abhi
j
it Menon-Se
n
Clarify that "git lo
g
x
.
c y
.
h" list
s
commits tha
t
t
o
u
ch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Junio C Hamano
Merge
git://r
e
po
.
or
.
cz/gi
t
-g
u
i
commit
|
commitdiff
|
tree
2008-07-26
Step
h
a
n
B
eyer
g
i
t-r
e
s
e
t: Let -q hu
s
h
"locally modif
i
ed" messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
B
r
ad Kin
g
g
i
t-svn:
t
e
ach dcommit
a
bout
s
vn auto-props
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Johanne
s
S
i
xt
W
i
nd
o
ws: D
o
not c
o
mpile git-she
l
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Jo
h
annes S
i
xt
W
i
n
d
ows: Make sur
e
ar
g
v[0] has
a
path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Johannes
S
ixt
Windows: Make $(gite
x
ec
d
ir) relati
v
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Johannes Si
x
t
All
o
w
a
dd_pa
t
h()
to add non-existent directories to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Johannes
Si
x
t
A
llow t
h
e built-in exec path to be r
e
l
ativ
e
t
o
the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Johannes Six
t
F
ix relative built-in pat
h
s to b
e
relative to the
c
omma
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Johannes Sixt
Rec
o
rd the com
m
and invocati
o
n
p
ath early
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
J
o
hanne
s
Sixt
Makefile: Normalize $(bindir
)
and $(gite
x
ecdi
r
)
before
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Johannes Sixt
Makefile: Do not install a
c
opy of
'git' in $(gitexecd
i
r
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Rene Scharfe
arch
i
ve: allow --exec
and --r
e
mote
w
ithou
t
e
qual s
i
gn
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Rene Scharfe
archive: declare struc
t
arch
i
ver where it's
n
eeded
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Rene S
c
harfe
archive: define
MAX_ARGS where it's
n
eeded
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Re
n
e Scharfe
archive: move par
a
mete
r
pa
r
s
ing code to
a
rchive
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Re
n
e
S
charfe
archiv
e
: add
w
rite_archive
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Steve
H
aslam
Rem
o
ve re
f
erences to git
-
fetch-pack from "git clone
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Stephan B
e
y
e
r
g
i
t-am: Mention --abort in usag
e
s
t
rin
g
part of OPTIONS_SPEC
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Steve Haslam
Propagate -
u
/--upload-pac
k
opt
i
o
n
of "git c
l
on
e
" to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
St
e
p
h
an Beyer
editor
.
c:
Li
b
i
f
y
l
aunch_edito
r
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Stepha
n
Beyer
Move launch_edito
r
() from
b
uiltin-ta
g
.
c to editor
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Junio C Hamano
Mer
g
e branch
'
mai
n
t
'
commit
|
commitdiff
|
tree
2008-07-25
Junio C Ham
a
no
D
o
cum
e
ntation:
clarify how
t
o
disable elements
in core
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Jun
i
o C Hamano
Makef
i
l
e: fix
s
hell quoting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Junio C Hamano
tests: p
r
opagate $(T
A
R
)
down from the toplevel Makefile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
B
jörn Steinb
r
i
n
k
index-pack
.
c: corr
e
ctly
ini
t
ialize
a
ppen
d
ed o
b
jects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Peter
Valde
m
ar Mørch
send-email: find body-encoding corr
e
ctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Jonath
a
n Ni
e
der
document that gi
t
-tag can tag more than heads
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Br
a
ndon Casey
perl/Ma
k
e
f
ile:
up
d
a
t
e NO_PE
R
L
_
MAKEMAKER
sec
t
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
SZEDER Gábor
b
ash
:
offer
o
nly paths
a
ft
e
r '
-
-' f
o
r '
g
it
check
o
ut
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
SZEDER
G
ábor
checkout: mention '--' in the docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Junio C Hama
n
o
Merge branch 'ph/checkou
t
'
commit
|
commitdiff
|
tree
2008-07-25
Pier
r
e
H
a
bouzit
git-checkout: improve erro
r
m
essages, detect ambiguities
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
O
l
i
v
i
e
r
Mar
i
n
upd
a
t
e
test
c
a
s
e to protect am -
-
skip behaviour
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
B
randon
C
asey
Teach fsck a
n
d prune about the n
e
w location of temp
o
rar
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-24
Junio
C
Ha
m
ano
Merge
branch 'm
a
i
n
t' into ph/
c
heckout
commit
|
commitdiff
|
tree
2008-07-24
Stephan Bey
e
r
Make non-sta
t
ic function
s
, that
m
ay be
s
tatic, stati
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-24
J
unio
C
Hamano
ignore
non-existent refs in dwim_
l
og()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-24
Thomas
R
a
s
t
g
it-com
p
l
e
t
ion
.
bash: provid
e
compl
e
tion for 'sho
w
-
b
r
anch'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-24
Lee Marlow
b
a
sh completion: A
d
d long opti
o
ns for 'git
r
m'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
P
.
Chri
s
t
eas
svnimport: newer lib
s
vn wa
n
t
s us to ask for the root
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Petr Baudis
Doc
u
mentation/git-filt
e
r-branch: teach "rm" instead
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Johannes Schindelin
git
d
a
emon: av
o
id waking
u
p
t
o
o
often
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Joh
a
nn
e
s Sch
i
n
del
i
n
builtin-
c
ommit: Two trivial style-
c
leanups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
J
unio C
H
amano
Doc
u
mentation: clarify diff --cc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Step
h
a
n Be
y
er
a
m --
a
bort:
A
dd to
b
ash
-
completion and mention
i
n git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Pet
r
Baudis
git-
f
ilter-branch
.
sh: Allow run
n
ing in bare repositori
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Jun
i
o C Hamano
builtin-branch
.
c: op
t
imize --merge
d
and -
-
no-
m
erged
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Junio C Hamano
builtin-branch
.
c:
r
emove unused code i
n
append_ref
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Junio
C Hamano
stash save: fix parameter h
a
ndl
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
St
e
phan
Be
y
e
r
git-am: Add colon before
t
he
subject that is printed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
P
i
e
r
r
e Habouzit
g
i
t-checkout:
f
i
x
command line par
s
ing
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Jo
h
annes Sixt
rebase -i: When an 'edit' st
o
p
s
, m
e
ntion the commit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Johannes
S
c
h
indelin
sort_in_t
o
pologica
l
_order
(
): avoid set
t
ing a commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
J
o
h
a
nnes Schindelin
Add test to show that show-bra
n
ch misses out the 8th
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Johannes Schindelin
Ignore dirty submodule states
i
n
"
gi
t
pull --rebase"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
B
r
an
d
on Casey
t/
t
4
20
2
-l
o
g
.
sh: add newline at end of f
i
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Bran
d
o
n
Casey
t
7502-commit
.
sh: rear
r
ange test to m
a
ke more
p
orta
b
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Brandon Case
y
t3
2
0
0
,t72
0
1:
r
eplace '!
'
w
i
th test_must_f
a
il
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Brand
o
n Casey
t4116-apply-reve
r
se
.
sh: use $TAR rather t
h
an tar
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Brand
o
n Casey
t/: Replace diff [-u
|
-U0] with
test
_
cmp
to all
o
w
compil
a
ti
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t7
6
01: exten
d
the 'merge picks up the best
r
esult'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Dan
i
el B
a
rkalow
In perforce,
R
CS keywords are case-sensiti
v
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Alex R
i
esen
Allow pager of diff comm
a
nd be enabled/d
i
sabled
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
J
o
hanne
s
Sc
h
indeli
n
Fix two leftovers fr
o
m
path
_
list->string_lis
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Olivier
M
arin
g
i
t
am -
-
ski
p
: clean th
e
i
ndex
while preserving loca
l
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Pierr
e
Habouzit
git-
s
ubmodule
:
move ill placed shift
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next