repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
user-manual: describe how higher stages are set during a merge
2008-05-14
Junio
C
Hamano
Merge branch 'sb/c
o
mmitter'
commit
|
commitdiff
|
tree
2008-05-14
Junio
C Hamano
Merge br
a
nch 'bd/tes
t
s'
commit
|
commitdiff
|
tree
2008-05-14
J
u
nio
C Haman
o
Merge branch
'
m
v
/
f
or
m
a
t-
c
c'
commit
|
commitdiff
|
tree
2008-05-14
Junio C Hamano
Merge bran
c
h 'cc/hooks-doc
'
commit
|
commitdiff
|
tree
2008-05-14
Junio C Hamano
Merge branch 'jk/rena
m
eli
m
it' (early
p
art)
commit
|
commitdiff
|
tree
2008-05-13
Junio
C H
a
m
a
no
git-svn: add test for --a
d
d
-
author-from and --us
e
-
l
o
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-05-12
Junio C Hama
n
o
Merge branch 'gp/
b
isect-
f
ix'
commit
|
commitdiff
|
tree
2008-05-11
Junio C
H
amano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2008-05-11
Junio C Hamano
Merge
branch
'maint-1
.
5
.
4' int
o
main
t
commit
|
commitdiff
|
tree
2008-05-11
Junio C H
a
mano
M
e
r
g
e
branch
'lt
/
c
o
re-optim'
commit
|
commitdiff
|
tree
2008-05-11
Junio C H
a
mano
Me
r
ge bra
n
ch 'p
y
/d
i
ff
-
s
ubmodule'
commit
|
commitdiff
|
tree
2008-05-11
Junio C Hamano
Merge
br
a
nch 'lt/cas
e
-
i
nsen
s
iti
v
e'
commit
|
commitdiff
|
tree
2008-05-09
Junio
C Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2008-05-09
J
u
n
io C
H
am
a
no
Merge br
a
nch 'maint-1
.
5
.
4' into
m
a
int
commit
|
commitdiff
|
tree
2008-05-09
Jun
i
o C Hamano
Merge bran
c
h 'sg/
m
erge-options' (early part)
commit
|
commitdiff
|
tree
2008-05-09
Junio C
H
a
m
ano
Merg
e
branch 'd
b
/learn-HEAD'
commit
|
commitdiff
|
tree
2008-05-09
Junio C
H
a
m
an
o
Me
r
g
e branch 'jn/webfee
d
'
commit
|
commitdiff
|
tree
2008-05-09
J
u
nio C Ha
m
ano
Merge br
a
nc
h
'cc/he
l
p'
commit
|
commitdiff
|
tree
2008-05-09
Junio
C Ham
a
no
Merg
e
branch 'dm/ch
e
r
r
y
-pick
-
s
'
commit
|
commitdiff
|
tree
2008-05-09
Junio
C H
a
m
a
n
o
Merge
b
ran
c
h
'lt/d
i
rma
t
ch-opti
m
'
commit
|
commitdiff
|
tree
2008-05-06
Junio C Hamano
Merge br
a
nch 'jc/lstat
'
commit
|
commitdiff
|
tree
2008-05-06
J
unio C
H
amano
Merge branch
'
bc/filt
e
r-branch'
commit
|
commitdiff
|
tree
2008-05-06
J
u
n
io C
Hama
n
o
M
e
rge branch 'lh/git-file'
commit
|
commitdiff
|
tree
2008-05-06
Ju
n
i
o
C Haman
o
Merg
e
branch 'jk/fetch-status
'
commit
|
commitdiff
|
tree
2008-05-06
Junio C Hamano
Me
r
ge
branch 'lh/bran
c
h-m
e
rged'
commit
|
commitdiff
|
tree
2008-05-06
Junio C Ha
m
ano
Merg
e
branch 'pb/remote
-
mirror-config
'
commit
|
commitdiff
|
tree
2008-05-05
Ju
n
i
o
C Hamano
is
_
racy_timesta
m
p(): do
not check time
s
tamp
f
o
r gitlinks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-05-05
Junio
C
Ha
m
ano
diff-lib
.
c: rename check_work_t
r
e
e_entity()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-05-05
Junio C H
a
mano
dif
f
: a submodule not checked
out
is not
m
odifie
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-05-04
Junio C Hamano
M
erge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2008-05-04
Junio C Hamano
Merge br
a
nch 'maint-1
.
5
.
4' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2008-05-03
Junio C
H
amano
Merge commit
'
sg/mer
g
e-options^'
into jk/r
e
namelimit
commit
|
commitdiff
|
tree
2008-04-30
Junio C Hama
n
o
Merge bra
n
ch
'
maint'
commit
|
commitdiff
|
tree
2008-04-30
J
unio C H
a
mano
f
e
t
c
h-pack: brown paper
bag fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-04-30
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-04-30
Junio C Hamano
Merge bra
n
ch '
m
a
i
nt-1
.
5
.
4'
i
nt
o
maint
commit
|
commitdiff
|
tree
2008-04-28
J
unio
C
Hamano
Merg
e
branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-04-28
Jun
i
o C Hamano
cl
o
n
e
: detec
t
and fa
i
l on exces
s
p
a
ramete
r
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-04-28
Junio
C Hamano
Merge
b
r
anch
'
m
aint-1
.
5
.
4
' into m
a
int
commit
|
commitdiff
|
tree
2008-04-25
J
u
nio C Hamano
Mer
g
e branc
h
'h
o
/shared'
commit
|
commitdiff
|
tree
2008-04-25
J
u
n
i
o C Ha
m
an
o
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2008-04-25
Junio C Hamano
Merge
b
ranc
h
'main
t
-
1
.
5
.
4' into maint
commit
|
commitdiff
|
tree
2008-04-23
Junio C Hamano
writ
e
-
t
ree:
properly de
t
e
c
t failure to wr
i
te tree objects
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-04-23
Junio C Hamano
Mer
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2008-04-23
Juni
o
C H
a
m
a
n
o
M
e
rge
b
ranch 'maint-1
.
5
.
4' int
o
maint
commit
|
commitdiff
|
tree
2008-04-22
Junio C Ha
m
a
no
Me
r
ge
branch '
m
aint'
commit
|
commitdiff
|
tree
2008-04-20
J
u
nio
C Hamano
First batch of post
1
.
5
.
5
up
d
a
t
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-04-20
Ju
n
io C Ha
m
a
n
o
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2008-04-20
Junio C Hamano
GIT 1
.
5
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-04-20
Junio C Hamano
Merge br
a
nc
h
'jc/maint-rebase-a
m
' into maint
commit
|
commitdiff
|
tree
2008-04-20
Junio C Haman
o
Merg
e
branch 'jc/s
h
a1-
l
ookup'
commit
|
commitdiff
|
tree
2008-04-20
Junio C
H
a
mano
M
e
rge br
a
nch 'jc/dirstat'
commit
|
commitdiff
|
tree
2008-04-20
Junio C Haman
o
Merge br
a
nch 'mv/defer-gc'
commit
|
commitdiff
|
tree
2008-04-20
J
unio C Haman
o
Mer
g
e
b
r
a
nch 'py/submodule'
commit
|
commitdiff
|
tree
2008-04-20
Junio C Hamano
Merge
branch 'jc/
t
erm
i
nator-separ
a
tor'
commit
|
commitdiff
|
tree
2008-04-20
Junio C
H
amano
Merge branch
'
j
k
/
remote-defa
u
lt-show'
commit
|
commitdiff
|
tree
2008-04-20
J
u
n
io C H
a
mano
M
erge branch 'mk/c
o
lor'
commit
|
commitdiff
|
tree
2008-04-19
Junio C Hama
n
o
Merge branch 'jc/maint-
r
ebas
e
-am'
commit
|
commitdiff
|
tree
2008-04-19
J
unio C Hamano
Merg
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2008-04-19
Junio C Hama
n
o
Merge branch 'maint
-
1
.
5
.
4' into maint
commit
|
commitdiff
|
tree
2008-04-18
Junio C
Hamano
a
m: POS
I
X portab
i
lity
f
i
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-04-17
Junio C Hamano
Me
r
ge branch '
m
ai
n
t'
commit
|
commitdiff
|
tree
2008-04-17
Juni
o
C Hamano
Merge branch
'ma
i
nt-1
.
5
.
4' into
m
aint
commit
|
commitdiff
|
tree
2008-04-16
Junio C
H
amano
g
i
t
-am: mi
n
or clea
n
up
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-04-16
Junio C Hamano
r
ebase
:
do
no
t
munge commit l
o
g m
e
ssage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-04-16
Jun
i
o
C Hamano
Merge
branch 'm
a
int'
commit
|
commitdiff
|
tree
2008-04-16
Junio C H
a
mano
Merge branch 'm
a
int
-
1
.
5
.
4' into maint
commit
|
commitdiff
|
tree
2008-04-15
Junio C
Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2008-04-13
Jun
i
o C Hamano
F
ix git_config_bool_or_int
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-04-13
Junio C Hama
n
o
dif
f
-files: mar
k
a
n
ind
e
x entry we know i
s
up-to-date
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-04-13
Junio C Haman
o
write_index(): optim
i
ze ce_s
m
ud
g
e_racily
_
clean_en
t
ry
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-04-13
Junio C Hamano
M
erge branch
'
main
t
'
commit
|
commitdiff
|
tree
2008-04-13
Junio C Hama
n
o
t7401: squelch
garbage output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-04-13
Junio C Ham
a
no
gi
t
_confi
g
_bool_o
r
_int()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-04-13
Jun
i
o C Haman
o
Document
a
tion/git-submo
d
ule: typofi
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-04-12
Junio
C Hamano
Merg
e
br
a
nch 'm
a
int-1
.
5
.
4'
i
nto maint
commit
|
commitdiff
|
tree
2008-04-12
Junio
C Hamano
Document -
w
opti
o
n
to shortlog
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-04-12
Junio C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2008-04-12
J
u
nio C Hamano
Merge branch 'main
t
-1
.
5
.
4
' in
t
o maint
commit
|
commitdiff
|
tree
2008-04-10
Junio C Hamano
log: teach
"
t
erminator" vs "se
p
arator" mode to "
-
-pretty
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-04-10
Junio
C Hama
n
o
Merge
b
ranch
'maint'
commit
|
commitdiff
|
tree
2008-04-10
Juni
o
C
H
aman
o
Merge branch '
m
aint-1
.
5
.
4
'
into mai
n
t
commit
|
commitdiff
|
tree
2008-04-09
Junio C Hamano
sha1-l
o
okup: make selectio
n
o
f
'middle' less aggressive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-04-09
Junio C Hamano
d
i
ff
:
m
a
ke --di
r
stat binary-file safe
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-04-09
Junio C Hamano
sh
a
1-lookup: more memory e
f
ficie
n
t search in sorted
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-04-09
Junio C Hamano
M
erge branch 'jc/renam
e
'
commit
|
commitdiff
|
tree
2008-04-09
Junio C Haman
o
Merge bran
c
h
'gp/gitweb'
commit
|
commitdiff
|
tree
2008-04-09
Junio C Hamano
Merge branch 'mk/unpack-careful'
commit
|
commitdiff
|
tree
2008-04-09
Junio C Hamano
Merge branch 'fl/send
-
em
a
il-
o
u
t
side'
commit
|
commitdiff
|
tree
2008-04-09
Jun
i
o C Ha
m
ano
M
erg
e
branch 'jc/reba
s
e'
commit
|
commitdiff
|
tree
2008-04-09
Junio
C
Haman
o
Merg
e
br
a
nc
h
'jk/add-i-mode'
commit
|
commitdiff
|
tree
2008-04-09
Junio
C
Hamano
Merge br
a
nch 'gs/pretty-hex
v
al'
commit
|
commitdiff
|
tree
2008-04-08
Jun
i
o
C Haman
o
GIT 1
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-04-08
Juni
o
C H
a
mano
Merge gi
t
://git
.
ker
n
el
.
org/
p
ub/scm/gi
t
k/g
i
tk
commit
|
commitdiff
|
tree
2008-04-07
Junio C Hamano
Me
r
ge branch 'j
c
/maint-apply-
m
atch-beginning'
commit
|
commitdiff
|
tree
2008-04-07
Junio C Hamano
Fix "git apply" to cor
r
ectly enforce "match at the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-04-05
Junio C Hama
n
o
Merge g
i
t:/
/
r
e
p
o
.
or
.
cz/git-
g
ui
commit
|
commitdiff
|
tree
2008-04-02
Junio C Ha
m
a
n
o
GIT 1
.
5
.
5-r
c
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-04-02
Junio
C
Ha
m
an
o
Merge branch 'js/filter-branch'
commit
|
commitdiff
|
tree
2008-04-02
Junio C Haman
o
Merge git:/
/
repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
next