repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
builtin/merge.c: reduce parents early
2012-04-18
J
u
nio
C
Hamano
builti
n
/m
e
rge
.
c
: reduce pa
r
ents early
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-18
J
unio C Hamano
builtin/
m
erge
.
c:
c
o
l
lect other parents earl
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-18
Junio C Ha
m
ano
builtin/merge
.
c
:
remove
"remot
e
h
e
ads" global variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
Junio C H
a
mano
Merge branch 'maint-1
.
7
.
8' into ma
i
nt-
1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
M
erge branch 'jc/main
t
-verify-obj
e
cts-remove-pessimism
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C
H
aman
o
Merg
e
branc
h
'dw
/
gitweb-doc-
g
rammo' int
o
maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio
C
Ham
a
n
o
Mer
g
e branch 'tr/
c
ache-t
r
ee' into
m
ain
t
-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C Ham
a
no
Merge branch 'cb/maint-t554
1
-mak
e
-server-p
o
rt-portable
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
J
u
nio C Hama
n
o
Merge
b
r
a
n
c
h 'cn
/
maint-rev-list-doc' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
M
erge bran
c
h '
t
r/maint-bundle
-
boundary' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C
Hamano
Merg
e
br
a
nch 'tr/maint-bu
n
dle-long-subject'
i
n
to m
a
in
t
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Ham
a
n
o
Mer
g
e
b
ranch 'ph/rerere
-
doc' int
o
maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-02
Junio C Hamano
Git 1
.
7
.
9
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Junio C Hamano
Merge b
r
anch 'j
c
/maint-merge-auto
e
dit' into
m
a
i
n
t
commit
|
commitdiff
|
tree
2012-03-26
Junio C Hamano
Git 1
.
7
.
9
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Junio C Hamano
M
erge branch
'jn/maint-fast
-
i
mport-em
p
ty-ls' i
n
to main
t
commit
|
commitdiff
|
tree
2012-03-26
Junio
C
Hamano
Merge branch 'ph/rerere-
d
o
c' into maint
commit
|
commitdiff
|
tree
2012-03-26
Ju
n
io
C Haman
o
Merge bran
c
h
'm
s
/
maint-config-
e
rror-at-eol-linecount
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
Ju
n
io C H
a
mano
Merge branch 'maint-1
.
7
.
8'
i
nto maint
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hamano
merge: b
a
ckpor
t
GIT
_
MER
G
E
_AUTOEDIT support
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-20
Ju
n
io C Hamano
Merge b
r
anch 'k
s
/so
r
t-wild
c
ard-i
n
-makefile' into
m
aint
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hama
n
o
Merge branch 'jc/a
d
vise-
i
18n'
i
n
to ma
i
nt-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hama
n
o
Merge bran
c
h 'j
n
/gitwe
b
-unspeci
f
ied
-
action' in
t
o
m
a
int
.
.
.
commit
|
commitdiff
|
tree
2012-03-15
Junio C Ham
a
no
f
e
tch/r
e
ceive: remove over-pessimistic connectivity
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hamano
Git 1
.
7
.
9
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
Ju
n
io C
Hama
n
o
Merge br
a
nc
h
'tr/maint-bundl
e
-bo
u
ndary
'
into maint
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hamano
Me
r
ge branch 'jc/m
a
int-diff-p
a
tch-header' in
t
o maint
By
Junio C Hamano
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hamano
Merge branch 'jn/maint-do-
n
ot-ma
t
c
h
-w
i
th-un
s
anitized
.
.
.
commit
|
commitdiff
|
tree
2012-03-12
Junio
C
H
amano
Merge branch 'jc/am-3-n
o
nstandard-popt
'
into
m
aint
commit
|
commitdiff
|
tree
2012-03-06
J
u
n
io C Hamano
Merge br
a
nch 'ma
i
nt-1
.
7
.
8
'
into maint
commit
|
commitdiff
|
tree
2012-03-06
Jun
i
o C
Hamano
Me
r
ge branch 'maint-1
.
7
.
7' into m
a
i
nt-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-05
Junio
C
Hamano
Git 1
.
7
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
Ju
n
io C Haman
o
M
erge branch 'j
c
/doc-merge-options' into
m
a
in
t
commit
|
commitdiff
|
tree
2012-03-05
J
unio
C
Hamano
Merge bran
c
h
'cn/m
a
int-rev-list-doc' into maint
commit
|
commitdiff
|
tree
2012-03-05
J
u
nio C Hamano
Up
d
at
e
draft
rel
e
a
s
e
notes to 1
.
7
.
9
.
3 for the last
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
Junio C
H
amano
Merge branch 'cn/maint-branch-with-bad' i
n
to m
a
int
commit
|
commitdiff
|
tree
2012-03-05
Junio C
H
a
m
a
no
Merg
e
branc
h
'jn/maint-gi
t
web-in
v
alid-reg
e
x
p' into
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
Jun
i
o C Hamano
M
e
rge branc
h
'nd/maint-verif
y
-objects' into maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C
Haman
o
M
erge
b
ranch 'jk/maint
-
a
void-str
e
aming
-
filter
e
d-contents
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
Junio C
H
am
a
no
Me
r
ge b
r
anch 'jb/fil
t
er-ignor
e
-s
i
gpipe
'
into maint
commit
|
commitdiff
|
tree
2012-03-05
Juni
o
C Hamano
Merge branch 'sp/smart-http-failure-to-push' in
t
o maint
commit
|
commitdiff
|
tree
2012-03-05
Jun
i
o
C Ha
m
ano
Merge branch
't
r
/maint
-
bund
l
e-long-subject' i
n
to
m
a
int
commit
|
commitdiff
|
tree
2012-03-02
Junio C H
a
mano
Docu
m
e
ntatio
n
: d
o
not a
s
sume that n > 1 in <rev>~$n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Jun
i
o
C
Hamano
d
i
ff -p:
s
quelch "diff
-
-git"
header for s
t
a
t
-
d
irty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Junio C Haman
o
t4011: illustrate
"di
f
f-index -p" on stat-
d
irty paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Junio C Hamano
t4011: m
o
dernise style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Juni
o
C H
a
mano
U
pda
t
e
draft release
n
otes to 1
.
7
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
J
u
nio C Hamano
Mer
g
e branch
'pj/remote-s
e
t-branches-u
s
age-fix'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2012-02-27
Junio
C
Hamano
Merge
br
a
nc
h
'jn/gitweb
-
unborn-head' into maint
commit
|
commitdiff
|
tree
2012-02-27
Junio C
Ham
a
no
Merge br
a
nch
'jn/ancient
-
meld-support' into maint
commit
|
commitdiff
|
tree
2012-02-27
Junio C Ham
a
no
Merge
b
ranch 'tr/merg
e
-edit-guidance' into main
t
commit
|
commitdiff
|
tree
2012-02-27
J
u
nio C Hamano
t
e
st: "am -3" can accept non-standard -
p
<
n
um>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Junio C
Hamano
Documen
t
a
ccum
u
l
a
ted fix
e
s si
n
c
e
1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Ju
n
io
C Hamano
Merge branch 'jc/add-refresh
-
unmerged' into main
t
commit
|
commitdiff
|
tree
2012-02-27
J
u
n
io C Hamano
Merge bra
n
ch
'js
/
configure-libintl' i
n
t
o
maint
commit
|
commitdiff
|
tree
2012-02-27
Junio C Ha
m
ano
Sync with 1
.
7
.
8
.
5
commit
|
commitdiff
|
tree
2012-02-27
J
unio C Hamano
G
i
t 1
.
7
.
8
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-23
J
unio
C Hamano
Document mer
g
e
.
b
ra
n
ch
d
es
c
configurati
o
n variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-23
Jun
i
o C Hamano
am -3: a
l
lo
w
nons
t
andard -p<nu
m
> option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-23
Junio
C
Ham
a
no
Git 1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-22
Junio C Hamano
Documen
t
ation/
m
e
r
ge
-
optio
n
s
.
txt:
g
rou
p
"ff" related
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-21
Junio C
H
amano
Up
d
ate draf
t
re
l
ease notes to 1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-21
Juni
o
C
H
amano
Merge branch
'
cb/receive-pack
-
keep-
e
rrors' into maint
commit
|
commitdiff
|
tree
2012-02-21
Junio C Hamano
Merge b
r
anch 'cb/transfer-no
-
prog
r
ess'
i
nto m
a
i
n
t
commit
|
commitdiff
|
tree
2012-02-21
Junio C Ha
m
ano
M
erge branch 'jk/git-dir
-
lookup
'
into main
t
commit
|
commitdiff
|
tree
2012-02-21
Jun
i
o
C
Hamano
Merge branc
h
'jc/diff-
s
tat-scaler' into ma
i
nt
commit
|
commitdiff
|
tree
2012-02-21
J
u
n
i
o C
H
am
a
no
Merge branch 'zj
/
term-c
o
lumns' into maint
commit
|
commitdiff
|
tree
2012-02-21
Ju
n
io C Hamano
Merge
b
ranc
h
'cb
/
maint-rev-
l
ist
-
verify-object'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2012-02-21
J
u
nio C Hamano
M
erge branch 'c
b
/maint
-
t5541
-
make-server-port-portabl
e
.
.
.
commit
|
commitdiff
|
tree
2012-02-21
Junio
C
Haman
o
Merge branch 'dp/
i
18n-libch
a
rset' into maint
commit
|
commitdiff
|
tree
2012-02-21
J
u
ni
o
C
Hamano
Merge branch 'jk/grep-
b
in
a
r
y
-
a
ttribute' into maint
commit
|
commitdiff
|
tree
2012-02-21
J
u
nio C Hamano
Merge
b
ranch 'nd/diffstat
-
g
ramnum' into main
t
commit
|
commitdiff
|
tree
2012-02-21
Ju
n
io
C
H
ama
n
o
Merge branch 'nd/f
i
nd-pack-entry-re
c
ent-cach
e
-invalidation
.
.
.
commit
|
commitdiff
|
tree
2012-02-21
Junio C
Hamano
Merge b
r
anc
h
't
t
/profile-bui
l
d-fix' in
t
o maint
commit
|
commitdiff
|
tree
2012-02-21
Junio
C Ham
a
no
Merge b
r
anc
h
'fc/zsh-completi
o
n'
in
t
o
maint
commit
|
commitdiff
|
tree
2012-02-20
Junio C Ham
a
n
o
Updat
e
draft relea
s
e notes
t
o
1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-17
Junio
C
H
a
mano
refresh_index: do n
o
t
s
how unmerged path
t
h
at is outside
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-16
Junio C Ha
m
ano
Updat
e
draft release notes to 1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-16
Junio C H
a
mano
Me
r
ge branch 'jc/checkout-out-of-unborn' into maint
commit
|
commitdiff
|
tree
2012-02-16
Ju
n
io C Hamano
Merge branch
'
j
c
/
m
ai
n
t-mailm
a
p
-outpu
t
'
into
maint
commit
|
commitdiff
|
tree
2012-02-16
Junio C H
a
mano
Merge bra
n
c
h
'
j
k/pro
m
pt-
f
a
l
l
back-to-
t
t
y
' into maint
commit
|
commitdiff
|
tree
2012-02-16
Junio
C
Hamano
Merge bra
n
ch 'jn/gitwe
b
-searc
h
-utf-8'
into maint
commit
|
commitdiff
|
tree
2012-02-16
Junio
C Hamano
Merge branch 'jc/m
a
int-commi
t
-ignore-i-t
-
a'
i
nto maint
commit
|
commitdiff
|
tree
2012-02-16
Junio C
H
aman
o
Merge branch 'mm/e
m
pt
y
-l
o
ose-error-messag
e
' into m
a
i
nt
commit
|
commitdiff
|
tree
2012-02-16
Junio C
H
amano
Me
r
ge bra
n
ch 'nk/ctype-for-perf' into
m
aint
commit
|
commitdiff
|
tree
2012-02-16
Junio C Hamano
Merge branch
'
jx/i18n-more-
m
arking' int
o
m
aint
commit
|
commitdiff
|
tree
2012-02-16
J
u
nio C Hamano
M
e
rge
branch '
r
t/comp
l
et
i
o
n-branch-edit-desc'
i
nt
o
.
.
.
commit
|
commitdiff
|
tree
2012-02-14
Ju
n
i
o C Hama
n
o
diff
-
-stat: sho
w
bars of
s
ame length for paths with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-14
J
u
n
i
o C Hamano
Git
1
.
7
.
9
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-14
Ju
n
io
C Hamano
M
erge branch '
j
k/
m
aint-t
a
g-show-
f
ixes' into m
a
int
commit
|
commitdiff
|
tree
2012-02-14
Junio
C
H
a
ma
n
o
Merge branch '
b
w
/
inet-p
t
on-ntop-
c
o
m
pat
'
into
m
a
i
nt
commit
|
commitdiff
|
tree
2012-02-14
Junio C Hamano
Merge branch 'mp/make-
c
leanse-x-for-exe' into maint
commit
|
commitdiff
|
tree
2012-02-14
Junio C
Hamano
Merge branch 'jn/mer
g
e
-no-ed
i
t-fix' in
t
o maint
commit
|
commitdiff
|
tree
2012-02-13
Junio C Ham
a
no
Update draft release notes to 1
.
7
.
9
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-13
Juni
o
C Ha
m
an
o
Merge branch 'js/add
-
e
-sub
m
odule-f
i
x' i
n
to maint
commit
|
commitdiff
|
tree
2012-02-13
Junio C Haman
o
Merge b
r
an
c
h
'jc/par
s
e
-date-raw' into
m
aint
commit
|
commitdiff
|
tree
2012-02-13
Junio C H
a
mano
Merge branch 'jc/m
e
rge-ff
-
only-stronger-than-signed
.
.
.
commit
|
commitdiff
|
tree
2012-02-13
Junio C Hamano
Merge branch 'jc/b
r
an
c
h-desc-typo
a
v
oidanc
e
' into m
a
i
n
t
commit
|
commitdiff
|
tree
2012-02-13
Junio C Hamano
Merge branch 'jn/
r
pm-spec' into maint
commit
|
commitdiff
|
tree
2012-02-10
Junio
C
Hamano
U
pdat
e
draft
r
elease not
e
s
to 1
.
7
.
9
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next