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
paint_down_to_common(): parse commit before relying on its timestamp
2012-10-04
J
u
nio C Hamano
paint_down_to_common(
)
: parse comm
i
t
before rel
y
i
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-31
Ju
n
io C Ha
m
ano
re
d
uce
_
heads
(
): r
e
i
m
plemen
t
on top of remo
v
e_redundant()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-31
J
unio C Hamano
me
r
ge-base:
"
--i
s
-ancestor A B"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-31
Junio C Hamano
get_
m
er
g
e_bases_many(): walk from
many tips in parallel
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-31
Junio C Haman
o
in_merge_
b
a
ses(): use
p
aint_dow
n
_to_common()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-31
J
unio C
H
a
mano
merge_
b
ase
s
_man
y
():
s
plit ou
t
the
l
o
g
ic to paint history
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-28
Junio
C
Hamano
h
t
t
p
-push: use in_me
r
ge_bases(
)
for f
a
st-for
w
ard c
h
ec
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-28
Ju
n
io C Hamano
receive-pack: use in_merge_bas
e
s() for fast-forwar
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-28
Junio C
Hamano
in_me
r
ge_bases(): s
u
pport only
o
n
e "other
"
commit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-26
Junio C
H
amano
Gi
t
1
.
7
.
9
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-26
J
u
nio C
Hamano
Sync wit
h
1
.
7
.
8
.
6
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Git
1
.
7
.
8
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Sync w
i
th 1
.
7
.
7
.
7
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Git 1
.
7
.
7
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-10
Junio
C Hamano
M
e
rge branch 'maint-1
.
7
.
8'
i
n
t
o maint-1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-09
Junio C Ham
a
no
Mer
g
e bra
n
ch 'jc/
m
a
i
nt-veri
f
y-objects-remov
e
-pessimism
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio
C
H
amano
Merge branch 'dw/g
i
tweb-doc-grammo' in
t
o m
a
int-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Merge branch
'tr
/
c
a
c
h
e-tre
e
' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Jun
i
o C
H
amano
M
erge branch 'cb/maint-t
5
541-make
-
se
r
ver-
p
ort-por
t
able
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Merge branch 'cn/m
a
int-rev-list
-
doc'
i
nto maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Jun
i
o
C Hamano
Merge branch
'tr/maint-bu
n
dle-b
o
undary
'
into
maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C
Hamano
Merg
e
branch 'tr/maint-bundle-long
-
su
b
j
e
ct' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
J
u
nio
C Hama
n
o
Merg
e
branch 'ph/rerere
-
doc'
into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-02
J
u
n
io C
H
a
m
ano
Gi
t
1
.
7
.
9
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-02
J
u
nio C Hamano
M
e
rge br
a
nch 'jc/maint-me
r
ge-autoe
d
it' into maint
commit
|
commitdiff
|
tree
2012-03-26
Junio C
H
a
m
ano
Gi
t
1
.
7
.
9
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-26
Junio C
Hamano
Merge
b
r
an
c
h
'
jn/maint-fast-impo
r
t-empty
-
ls'
i
n
t
o maint
commit
|
commitdiff
|
tree
2012-03-26
Junio C
H
amano
M
erge
b
r
a
nch 'ph/rerere-doc' int
o
maint
commit
|
commitdiff
|
tree
2012-03-26
Jun
i
o C Hamano
Merge bra
n
ch 'ms/maint-config-error-at-eol-linecou
n
t
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
Junio C H
a
mano
M
e
r
ge branch 'maint-1
.
7
.
8' into
maint
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hamano
merge: bac
k
port
G
IT_MERGE_A
U
TO
E
DIT support
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-20
Jun
i
o
C
Hamano
M
e
r
ge branch 'ks/s
o
r
t-wildcard-
i
n-makefile' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hamano
Merg
e
bra
n
ch '
j
c/advise-i18n' in
t
o m
a
int-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-20
Ju
n
io C H
a
m
a
n
o
Merge branch 'jn/gitweb-u
n
specified-
a
ction' into ma
i
nt
.
.
.
commit
|
commitdiff
|
tree
2012-03-15
Junio C Ham
a
no
fetch
/
rece
i
ve:
r
emo
v
e over-pessimi
s
tic conn
e
ctivi
t
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-12
J
unio C
H
am
a
no
Git 1
.
7
.
9
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-12
J
unio C Hamano
Merge bra
n
ch 'tr/maint-bundle-boundary' int
o
m
a
i
n
t
commit
|
commitdiff
|
tree
2012-03-12
Junio C H
a
man
o
Merge
b
ran
c
h 'jc
/
m
a
in
t
-dif
f
-
patch-header' i
n
to maint
commit
|
commitdiff
|
tree
2012-03-12
J
unio C Hamano
Merge
branch 'j
n
/maint-do-no
t
-ma
t
c
h
-with-unsanitized
.
.
.
commit
|
commitdiff
|
tree
2012-03-12
J
u
nio C
H
aman
o
Merge branch 'j
c
/am-
3
-
nonstandard-po
p
t' into maint
commit
|
commitdiff
|
tree
2012-03-06
J
u
nio C Hamano
Merge
b
r
a
nch 'maint-1
.
7
.
8'
i
nto maint
commit
|
commitdiff
|
tree
2012-03-06
Junio
C
Hama
n
o
Merge bran
c
h 'maint-1
.
7
.
7' into
m
aint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-05
Junio C Haman
o
Git 1
.
7
.
9
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-05
J
u
nio C Hamano
Merge branch 'j
c
/
doc-merge-options'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Merge branch 'cn/maint-rev-list-doc' i
n
to m
a
i
n
t
commit
|
commitdiff
|
tree
2012-03-05
J
unio
C
Hamano
Updat
e
dr
a
ft release
notes to 1
.
7
.
9
.
3
f
o
r the last
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-05
J
unio C Hamano
M
e
rge branch 'cn/ma
i
nt-branch-with-bad' into ma
i
n
t
commit
|
commitdiff
|
tree
2012-03-05
Junio C H
a
mano
Merge
b
ranch 'jn/main
t
-gitweb-invalid-r
e
ge
x
p
'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
Junio
C Haman
o
Merge branch
'
nd/maint-verify-objects' into maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C Ham
a
no
M
e
rg
e
bra
n
ch 'jk/maint-avoid-stre
a
ming-filtered-
c
o
n
t
e
n
t
s
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
Junio C
H
amano
Merge
branch
'jb/filter-ign
o
re-s
i
g
pip
e
'
into maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Merge branch 'sp/smart-http
-
fail
u
r
e-to-push' into maint
commit
|
commitdiff
|
tree
2012-03-05
Junio
C Hama
n
o
Merge bra
n
ch '
t
r
/
m
ain
t
-bundle-long-subject' into
main
t
commit
|
commitdiff
|
tree
2012-03-02
Junio C Hamano
D
ocumentation: do not
assume
t
hat n
>
1 in <rev>~$n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
Juni
o
C Hama
n
o
diff -p: squelch "d
i
ff
-
-git" h
e
ader
for stat-dir
t
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
Junio C Hamano
t
4
011: illustr
a
te "diff
-
i
n
de
x
-p" on stat-dirty
p
a
t
h
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
Junio
C
Ham
a
no
t
4
011
:
modernise style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Junio
C Hamano
Upda
t
e draft release notes to 1
.
7
.
9
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
Me
r
g
e branch 'pj/rem
o
te-s
e
t
-branches-
u
sag
e
-fix
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-02-27
J
unio
C
Hamano
Merge branch 'jn/gitweb-u
n
born-hea
d
'
i
nto
m
aint
commit
|
commitdiff
|
tree
2012-02-27
J
u
nio C Haman
o
Merge branch
'
jn/anci
e
nt
-
meld-supp
o
rt' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2012-02-27
Junio
C Hamano
M
erge branch 'tr/merge-edit-gu
i
d
a
nce'
into maint
commit
|
commitdiff
|
tree
2012-02-27
Junio
C Hamano
test: "am -3" can a
c
cept non-st
a
ndard -p<n
u
m>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Jun
i
o
C Hamano
Documen
t
accu
m
ulated f
i
xes since 1
.
7
.
9
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Jun
i
o
C Hamano
Merge
branch 'jc
/
add-refre
s
h
-
unmerged
'
i
n
to
m
ai
n
t
commit
|
commitdiff
|
tree
2012-02-27
Junio C
H
amano
M
erge b
r
anc
h
'js/configure-libintl
'
i
nto maint
commit
|
commitdiff
|
tree
2012-02-27
Junio
C
Hamano
Sync wit
h
1
.
7
.
8
.
5
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
Git 1
.
7
.
8
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-23
Junio C Hamano
Docume
n
t mer
g
e
.
branchdesc
configura
t
ion variable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-23
Junio C Hamano
a
m -3: allow non
s
tandard -p<n
u
m> opti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-23
Junio C Haman
o
G
i
t 1
.
7
.
9
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-22
Junio C Hamano
Document
a
tio
n
/merge-options
.
txt: group "ff" related
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-21
Jun
i
o C Hamano
Update
dra
f
t release notes t
o
1
.
7
.
9
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-21
Junio
C
Hamano
Merge b
r
anch '
c
b/receive-pack-keep-errors' into maint
commit
|
commitdiff
|
tree
2012-02-21
Junio C Ha
m
ano
Me
r
ge branch 'cb
/
tra
n
sfer-no
-
progress' into
maint
commit
|
commitdiff
|
tree
2012-02-21
Juni
o
C Haman
o
Merge b
r
anch 'jk/
g
it-di
r
-lookup' into
m
aint
commit
|
commitdiff
|
tree
2012-02-21
Juni
o
C
Hamano
Merge branch 'jc/diff-stat
-
sca
l
er'
i
n
to maint
commit
|
commitdiff
|
tree
2012-02-21
Junio C Ham
a
no
Merge br
a
n
ch 'zj/term-columns
'
into maint
commit
|
commitdiff
|
tree
2012-02-21
Junio C Hamano
M
e
rg
e
br
a
nch 'cb/m
a
int-rev-li
s
t-verify
-
obj
e
ct' into
.
.
.
commit
|
commitdiff
|
tree
2012-02-21
Juni
o
C Hamano
Merge
branch 'c
b
/ma
i
nt-
t
5541-mak
e
-server-port-portable
.
.
.
commit
|
commitdiff
|
tree
2012-02-21
Juni
o
C
Hamano
Merge branch 'dp/i18n-libch
a
rset'
i
nto
m
aint
commit
|
commitdiff
|
tree
2012-02-21
Juni
o
C Hamano
Merge branch 'jk/grep-
b
inary-att
r
ibute' into
maint
commit
|
commitdiff
|
tree
2012-02-21
Junio C H
a
mano
Merge branch 'nd/diffstat
-
gramnum' into maint
commit
|
commitdiff
|
tree
2012-02-21
Junio C Hamano
Merge branch 'nd
/
find-pack-e
n
try-rec
e
nt-cache-invalidation
.
.
.
commit
|
commitdiff
|
tree
2012-02-21
Jun
i
o C H
a
mano
Merg
e
branch 'tt/profile-build-fix'
i
n
to main
t
commit
|
commitdiff
|
tree
2012-02-21
J
unio C
H
amano
Merg
e
branch 'fc/zsh-c
o
mpletion' into
m
aint
commit
|
commitdiff
|
tree
2012-02-20
Jun
i
o C
H
a
mano
Updat
e
d
r
a
f
t
re
l
ease note
s
to 1
.
7
.
9
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-17
Jun
i
o
C H
a
mano
refresh_inde
x
: do n
o
t show unmer
g
ed path that is outside
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-16
J
u
n
io C Hamano
Update draft
r
elease notes to 1
.
7
.
9
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-16
Junio C Hamano
Mer
g
e br
a
nch 'jc/c
h
eckout-out-of-unb
o
rn' into m
a
int
commit
|
commitdiff
|
tree
2012-02-16
Junio C H
a
mano
Merge
b
ranch 'jc/maint-mailmap
-
output' into main
t
commit
|
commitdiff
|
tree
2012-02-16
Junio C Hamano
M
e
rg
e
b
r
anch 'jk/
p
ro
m
pt-fallback-to-t
t
y
'
i
nto ma
i
n
t
commit
|
commitdiff
|
tree
2012-02-16
Junio C
H
amano
Merge branch 'jn
/
gitweb-sear
c
h-u
t
f-8' into maint
commit
|
commitdiff
|
tree
2012-02-16
Juni
o
C Hamano
Merge
bra
n
ch 'jc/maint-commit-ignor
e
-i
-
t-a'
into maint
commit
|
commitdiff
|
tree
2012-02-16
Junio C H
a
mano
M
erge bran
c
h
'
mm/empt
y
-
l
oose-error-
m
essage' into maint
commit
|
commitdiff
|
tree
2012-02-16
J
unio C Haman
o
Merge branch
'
nk/ctype-for-p
e
rf' into m
a
int
commit
|
commitdiff
|
tree
2012-02-16
Junio C Hamano
Me
r
g
e
branch 'jx/i18n-
m
ore-marking' into main
t
commit
|
commitdiff
|
tree
2012-02-16
Junio C H
a
mano
Mer
g
e
branch 'rt
/
c
om
p
letion-bra
n
ch-edit-
d
esc' into
.
.
.
commit
|
commitdiff
|
tree
2012-02-14
Junio C H
a
m
a
no
diff --st
a
t: sho
w
b
ars of
sam
e
length for paths wit
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-14
Junio C Hamano
Gi
t
1
.
7
.
9
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next