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
Teach merge.log to "git-merge" again
2008-07-10
Junio C Hamano
Teach merge
.
log
to "git-me
r
ge" again
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
Buil
d
in mer
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-07
Mi
k
los Vajna
Fix t760
1
-
m
e
r
g
e
-
pull-config
.
sh
on AIX
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
git-commit-
t
ree: make it
u
sa
b
le from ot
h
er builti
n
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
A
dd new
test case to ensu
r
e git-
m
erge prepend
s
t
h
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
A
d
d new
test case
to e
n
sure git-merg
e
redu
c
es octopus
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Juni
o
C Hamano
Introduce reduce
_
h
e
ads(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
J
u
n
io C Hamano
Introduce get_merge_b
a
ses_m
a
ny(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
V
a
jna
Add new test to ensure git-merge handles more than
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Int
r
odu
c
e
get_octopus_merge_ba
s
es() in
c
ommit
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
g
i
t-fmt-merge-
m
sg
:
make it usable from other builtins
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos V
a
j
n
a
Move read_ca
c
h
e
_
unmer
g
ed(
)
to r
e
ad
-
cache
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
aj
n
a
Add ne
w
test
t
o ensure git-merge
handles pull
.
twohead
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move parse-optio
n
s's skip_prefix()
t
o git-compat-
u
t
i
l
.
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move c
o
mmit_list_count() to commit
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os V
a
j
na
Move
split_cmdline() to alias
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-30
Junio C Haman
o
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2008-06-30
Brian Gernhardt
Add
test resu
l
t
s
dir
e
ct
o
ry to
t
/
.
giti
g
nore
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-30
Jeff
K
ing
d
oc/r
e
v-pa
r
se: clarify reflog vs --until
f
o
r
spec
i
fying
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-30
Junio
C
Ham
a
no
Update
d
raft release notes fo
r
1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-30
jrnieder@uchica
g
o
.
e
du
Documentation: don't
a
ssume g
i
t-sh-setup and git-pa
r
se
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-30
Junio C Ham
a
no
t970
0
: skip when
T
est::
M
or
e
is not available
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-29
Junio C
H
ama
n
o
Merge br
a
nch 'm
a
int'
commit
|
commitdiff
|
tree
2008-06-29
Eri
c
W
o
n
g
git-svn: don't sanitize remote names in config
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-29
O
livier
M
a
rin
show_stats(): fix
s
ta
t
s wi
d
t
h calculat
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-29
Olivier
Marin
D
ocumentation
:
remove {show,whatchanged}
.
difftree conf
i
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-29
Av
e
ry Pennarun
git-
s
vn:
avoid filling up the dis
k
with temp f
i
les
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-29
Björn
S
t
e
inbrink
git cat-file: Fi
x
memory leak
in bat
c
h mode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
J
oey Hess
fix git config example syntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
Joche
n
Vo
s
s
avoid
o
ff-by-
o
ne error i
n
run
_
uplo
a
d
_
archive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
Lea Wi
e
mann
GIT-
V
ERSI
O
N
-
G
E
N: do
n
ot fail if a 'HE
A
D' fil
e
exist
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
Johannes
S
c
hi
n
deli
n
commit-tree: lift
complete
l
y
ar
b
itrary
l
imit of 16
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
Dmitry Potapov
s
hrink git-shell
by a
v
oiding re
d
un
d
ant
dependencies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
Chris
t
ian Cou
d
er
hel
p
:
check early if we have a
command, i
f
not t
r
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
Junio C Hamano
Docume
n
t the double-
d
ash "rev -- pa
t
h" disa
m
bigua
t
or
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
Te
d
P
e
rcival
Don't
use
d
a
sh commands (g
i
t-foo)
i
n tutorial-2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
L
e
a Wiemann
test-lib
.
sh
:
s
how git init ou
t
put when in verb
o
se mode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
Junio C Hamano
Me
r
ge br
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-06-27
Juni
o
C Hama
n
o
M
e
r
ge b
r
anch 'mai
n
t-1
.
5
.
5' into mai
n
t
commit
|
commitdiff
|
tree
2008-06-27
Junio C Hamano
GIT 1
.
5
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
Ju
n
io C Hamano
Mer
g
e b
r
anch 'm
a
i
nt-1
.
5
.
4' into
maint-1
.
5
.
5
commit
|
commitdiff
|
tree
2008-06-27
J
unio C Hamano
GIT 1
.
5
.
4
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
J
unio C
H
a
m
ano
git-shell:
a
ccept "
g
it foo" form
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Junio
C
Ham
a
no
diff --c
h
eck: do not
discar
d
erro
r
stat
u
s
upon seeing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Jeff Ki
n
g
im
p
rove
for-each-
r
ef test s
c
ript
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Jing Xue
Add
'
git-p4
.
allowS
u
b
mit' to
g
it-p4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Junio C Ham
a
no
Start dr
a
ft
rele
a
se notes for 1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Dmit
r
y Pot
a
pov
update-hook-example
:
opti
o
nally allow non-fast
-
forw
a
rd
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
J
u
nio C
H
a
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-06-26
Alex Riesen
Fix
use of
"
perl -i" on Wind
o
ws
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Jun
i
o C Hamano
GIT 1
.
5
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
Merg
e
branch
'
sb/r
e
base'
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
Me
r
ge branch 'lw/gitweb'
commit
|
commitdiff
|
tree
2008-06-25
Jun
i
o C
H
amano
Me
r
ge bra
n
ch 'lt/config-fsync'
commit
|
commitdiff
|
tree
2008-06-25
Jun
i
o C Hamano
M
erge branch 'sr/tests'
commit
|
commitdiff
|
tree
2008-06-25
J
u
nio C Hamano
Merge bra
n
ch 'jh/clone-packed-re
f
s'
commit
|
commitdiff
|
tree
2008-06-25
Junio
C
H
ama
n
o
M
e
r
ge branch 'lw
/
perli
s
h'
commit
|
commitdiff
|
tree
2008-06-25
Dmitry Potapov
fix u
p
d
a
te
-
hook-example to work w
i
th packed tag references
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
J
eff King
clone
:
c
r
ea
t
e inter
m
ediate direc
t
ori
e
s of des
t
ination
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
J
u
nio
C Ha
m
ano
Merge
bran
c
h 'jc/main
t
-
c
ombi
n
e-diff-p
r
e-
c
ont
e
xt' int
o
.
.
.
commit
|
commitdiff
|
tree
2008-06-25
Ju
n
io C Hamano
M
e
r
g
e branch
'lt/maint-gitdir-relative' i
n
to maint
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
Merge branch '
s
b/maint-r
e
base'
i
n
t
o maint
commit
|
commitdiff
|
tree
2008-06-25
J
e
f
f
Kin
g
for-each-ref: imp
l
ement missing tag values
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas P
i
t
r
e
verify-pack: test for detection of index v2
o
bje
c
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
N
ic
o
l
a
s
P
i
t
r
e
verify-
p
ack:
c
h
eck packed object CRC when usi
n
g
i
n
d
ex
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas Pitre
move sho
w
_pa
c
k
_info()
w
here it belong
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas P
i
t
r
e
optimize verify-p
a
ck a bit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Jef
f
K
ing
clone
:
crea
t
e intermediate
d
i
re
c
tories of des
t
inati
o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Junio
C Hamano
Ship
s
ample hooks with
.
samp
l
e suffix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Junio
C H
a
mano
p
re-r
e
base hook update
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas P
i
tre
refactor pac
k
s
t
ructure allocation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-24
Nicol
a
s
P
itre
t
e
st case for pac
k
resilience
a
g
a
i
n
st cor
r
uptions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-24
Nicolas Pitre
i
m
plement som
e
resi
l
ience against pac
k
corrupti
o
ns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-24
Nicola
s
Pitre
call init_pac
k
_re
v
inde
x
() l
a
zily
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-24
Junio C H
a
mano
Merg
e
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2008-06-24
Jan Krüge
r
git-s
v
n: make rebuild respect rew
r
it
e
R
oot
o
ption
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Pa
t
rick
Higgi
n
s
Workaround for A
I
X
m
kstemp()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
M
ichele Ballab
i
o
t
9
301-fast-ex
p
ort
.
sh
:
Remove
d
e
bug line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Linus To
r
valds
S
h
rink the git b
i
nary
a
bit by avoiding unnecessary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Junio
C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2008-06-23
Stephan
Beye
r
Extend parse-
o
ptions test suit
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Ste
p
han Be
y
er
ap
i
-par
s
e-options
.
txt: In
t
r
o
duce documentation for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Michele Ballabio
parse-o
p
ti
o
n
s
.
c: fi
x
d
o
cumentati
o
n syntax of optional
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Ste
p
han Bey
e
r
api-builtin
.
txt: u
p
date and fix typ
o
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
St
e
ph
a
n B
e
yer
git-rebase
.
sh: Add
che
c
k if r
e
base i
s
in pro
g
r
e
ss
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Stephan Be
y
er
t
3404: s
t
ricter tests for git
-
rebase--interactive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
St
e
phan Bey
e
r
ap
i
-builtin
.
tx
t
: upda
t
e and
fix typo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
Merge branch 'rs/archive-ignore'
commit
|
commitdiff
|
tree
2008-06-22
J
u
nio C Hamano
Merge bran
c
h
'lt/racy
-
empty'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
Merge branch 'sn/static'
commit
|
commitdiff
|
tree
2008-06-22
Junio
C
H
a
mano
M
e
rge branch 'jc/mai
n
t-combine-diff-pre-contex
t
'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
M
erge
b
ranch 'lt/maint-g
i
tdir-relative'
commit
|
commitdiff
|
tree
2008-06-22
J
u
ni
o
C Hamano
M
erge branch '
j
k/test'
commit
|
commitdiff
|
tree
2008-06-22
J
u
nio
C
H
a
man
o
Me
r
ge branch
'
pb/fas
t
-expor
t
'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
Merge bra
n
ch 'mo/status-untrac
k
e
d'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
Merge branc
h
'kh/upd
a
te-
r
ef'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
Merge b
r
a
n
ch 'jn/web'
commit
|
commitdiff
|
tree
2008-06-22
Jun
i
o C Ham
a
no
M
erge br
a
nch 'rg/gitw
e
b'
commit
|
commitdiff
|
tree
2008-06-21
Shawn O
.
Pearc
e
Correct documentation fo
r
g
i
t
-
push --
m
i
r
ror
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-21
Jakub Nare
b
s
ki
t/R
E
ADME: Add '
S
kipping
T
ests' secti
o
n b
e
low 'Ru
n
ning
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next