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
Merge branch 'jn/update-contrib-example-merge'
2010-09-03
Jun
i
o C Hamano
M
erge
b
ranch 'jn/update-contrib-
e
xample-
m
erge'
commit
|
commitdiff
|
tree
2010-09-03
J
unio C Hamano
Mer
g
e branch 'jn/merg
e
-
renormali
z
e'
commit
|
commitdiff
|
tree
2010-09-03
Juni
o
C Hamano
S
ync with 1
.
7
.
2
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-03
Juni
o
C Haman
o
Git 1
.
7
.
2
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-03
Thiag
o
F
ari
n
a
builtin/m
e
rge_
r
ecursive
.
c: A
d
d an
usage
string and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-03
Jens Lehm
a
nn
t7406
& t
7
4
0
7: add
m
i
s
s
in
g
&& at e
n
d of lines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-03
Jens Lehmann
t7
4
05: c
d
inside sub
s
hell
i
ns
t
ead of aro
u
nd
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-01
Junio C Hama
n
o
P
repare for 1
.
7
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-01
J
u
nio
C
Ha
m
ano
Merge
b
ranc
h
'maint'
commit
|
commitdiff
|
tree
2010-09-01
Junio C Hamano
P
repare for 1
.
7
.
2
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-01
Junio
C
Hamano
M
erge branc
h
'
gp/pack-
r
e
f
s
-remo
v
e-
e
mpty
-
dirs
'
into
.
.
.
commit
|
commitdiff
|
tree
2010-09-01
Junio C Hamano
Merge branch
'sg/
r
erere-g
c
-
o
ld-still
-
used'
i
n
t
o
main
t
commit
|
commitdiff
|
tree
2010-09-01
Juni
o
C
Hama
n
o
Merge branch 'np/
m
aint-huge-delta-gen
e
ration' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-09-01
Junio C
H
am
a
n
o
Merge
branch
'dj/fet
c
h-tagop
t
' into
main
t
commit
|
commitdiff
|
tree
2010-09-01
Junio C Ham
a
n
o
M
erge branch 'da/fi
x
-submodule-sync
-
superprojec
t
-config
.
.
.
commit
|
commitdiff
|
tree
2010-09-01
J
u
nio
C Hamano
Merg
e
b
ranch 'en/reb
a
s
e-aga
i
nst-rebase-fix' into ma
i
nt
commit
|
commitdiff
|
tree
2010-09-01
Junio C Haman
o
in
s
tal
l
-web
d
oc
:
filter timestamp-o
n
ly chang
e
s correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
Juni
o
C Ha
m
an
o
Merge br
a
nch 'np/m
a
int-hug
e
-delta-gen
e
r
ation
'
commit
|
commitdiff
|
tree
2010-08-31
J
u
nio C Ha
m
an
o
Merge branc
h
'da/fix-submod
u
l
e-sync-superproject-config'
commit
|
commitdiff
|
tree
2010-08-31
Junio C
Haman
o
M
e
rge bran
c
h '
j
n
/
c
h
erry-revert-
m
essage-clean-up'
commit
|
commitdiff
|
tree
2010-08-31
J
u
nio C Hamano
Merge bran
c
h 'cb/b
i
nary-patch-id'
commit
|
commitdiff
|
tree
2010-08-31
Junio
C
Hamano
Merge branch 'ab/maint
-
re
s
et-mixed-w
-
path
s
pec-advice'
commit
|
commitdiff
|
tree
2010-08-31
Juni
o
C Hamano
M
erge
b
ranch 'd
j
/fetch-tagopt'
commit
|
commitdiff
|
tree
2010-08-31
Junio
C
H
a
mano
Merge br
a
nch 'en/d
-
f-conflict-fix'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Ham
a
no
Merge br
a
nch 'jn/
s
v
n
-f
e
'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Merge branch '
t
r
/ma
i
nt-no-unquote-plus'
commit
|
commitdiff
|
tree
2010-08-31
J
u
ni
o
C Hamano
Merge
branch 'jn/p
a
g
inate-fix
'
commit
|
commitdiff
|
tree
2010-08-31
Ju
n
io
C
H
amano
Merg
e
branch 'jn/maint
-
setu
p
-fix'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Merge branch
'
en/fast-export-f
i
x'
commit
|
commitdiff
|
tree
2010-08-31
Junio C
H
a
mano
Me
r
ge branch 'hv/autosquash-config'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
M
e
rge branch 'sg
/
rerer
e
-gc-old-still-
u
sed'
commit
|
commitdiff
|
tree
2010-08-31
Anders Kaseorg
gitweb: Don't die_
e
rror in
g
it
_
ta
g
after already printi
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-30
Junio C Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2010-08-30
Junio C Hamano
M
erge
b
ranch
'
ma
i
nt-1
.
7
.
1' in
t
o
m
a
i
nt
commit
|
commitdiff
|
tree
2010-08-30
Thiago Farina
object
.
h: Add OBJECT_ARRAY_INIT m
a
cro
and make
use
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-30
Matthieu Moy
t0003: add
missing &&
a
t
e
n
d
of li
n
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-26
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-08-26
J
a
y Soffia
n
for-eac
h
-r
e
f: fix objectname:
s
hort bug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-25
Elijah N
e
wren
tree-walk: C
o
rrec
t
bitro
t
ted comment
a
bout tree_entry()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-25
Linus
Torv
a
lds
Fix 'git
l
og' early pager startup
erro
r
case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-24
Junio C Hamano
Merge branch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2010-08-24
Jonathan
N
i
eder
p
arse
-
options: clar
i
fy PARSE_OPT_N
O
A
R
G description
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-24
Jo
n
athan N
i
eder
t
3
302 (n
o
tes): Port to
S
olaris
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-24
Bri
a
n Gernhardt
t76
1
0: cd inside subshell i
n
stead of aroun
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-23
Junio C Hamano
Merge b
r
anch '
m
aint'
commit
|
commitdiff
|
tree
2010-08-22
Ralf Wildenhu
e
s
Typos in code comments, an
e
r
r
or mes
s
a
g
e, d
o
c
umentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-22
Ralf
Wildenhues
Typos in code
c
omments, a
n
err
o
r
message, documentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-22
Nicolas Pitre
f
i
x
>
4GiB sour
c
e
d
e
l
ta asse
r
t
i
on
failu
r
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-22
Ju
n
io C Hamano
M
e
r
ge branch 'mm/rebase-i-e
x
ec
'
commit
|
commitdiff
|
tree
2010-08-22
Junio
C
Hamano
Merge
b
ranch 'g
b
/split-cm
d
lin
e
-err
m
sg'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merge branch 'so/
h
t
t
p-user-agent'
commit
|
commitdiff
|
tree
2010-08-22
Junio C
Hamano
Merge branch 'm
m
/sho
r
t
opt
-
detached'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merg
e
b
ranch 'sr/local-confi
g
'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hama
n
o
Mer
g
e
branch '
n
d/fix-sparse-checkout'
commit
|
commitdiff
|
tree
2010-08-22
Junio C H
a
mano
Merge
branch 'h
v
/sub
m
odule-fi
n
d-ff-m
e
r
g
e'
commit
|
commitdiff
|
tree
2010-08-22
Junio C
H
amano
Merge branc
h
'en/rebase-agains
t
-reb
a
se-fix'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merge bran
c
h 'dg/
l
o
c
a
l-mod-err
o
r-mes
s
ag
e
s'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Ha
m
ano
Merge
branch 'po/userdiff-csharp'
commit
|
commitdiff
|
tree
2010-08-22
Ju
n
io C
H
amano
Mer
g
e branch 'a
b
/
per
l
-insta
l
l'
commit
|
commitdiff
|
tree
2010-08-22
Ævar Arnfjörð Bjarmason
reset:
suggest what
t
o
d
o
u
pon "git reset --mixed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merge bran
c
h '
m
aint
'
commit
|
commitdiff
|
tree
2010-08-22
Jens Lehmann
t7403: ad
d
missin
g
&&'s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-22
Mark
Rada
Tell ignore f
i
le
about ge
n
erate fil
e
s
i
n /gitw
e
b/static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jun
i
o C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
Merge b
r
anch
'
jc/maint
-
fol
l
ow-rename-fix'
i
nto
m
a
int
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
M
erge br
a
nch 'jn/
m
aint-plug-leak' into maint
commit
|
commitdiff
|
tree
2010-08-20
Junio
C
H
ama
n
o
Merge branch 'jn/fix-abbrev
'
int
o
maint
commit
|
commitdiff
|
tree
2010-08-20
Junio C
H
amano
Merge br
a
nch
'
vs/doc-spell' into
m
aint
commit
|
commitdiff
|
tree
2010-08-20
J
u
nio C
H
a
m
ano
M
erge bran
c
h 'jn/
r
ebase-rename-am'
into ma
i
nt
commit
|
commitdiff
|
tree
2010-08-20
Junio C Ham
a
no
Mer
g
e bra
n
c
h 'jn/doc-pu
l
l' into maint
commit
|
commitdiff
|
tree
2010-08-20
J
unio
C
Hamano
Merge bran
c
h '
b
c/use-more
-
h
a
r
dlink
s
-in-install'
into
.
.
.
commit
|
commitdiff
|
tree
2010-08-20
Jun
i
o
C Hamano
Mer
g
e branch 'tr/rfc-res
e
t-doc' into maint
commit
|
commitdiff
|
tree
2010-08-20
Ram
k
um
a
r Rama
c
ha
n
d
r
a
builtin/checkout: Fix messa
g
e when swi
t
ching
t
o
an
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Matthieu M
o
y
x
mal
l
oc: include
s
i
ze
i
n the failure message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Elij
a
h
Ne
w
ren
merge-recursive: A
v
oid exces
s
ive output for and reprocessing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-19
Junio C
Hamano
Merge branch
'maint' to sync with 1
.
7
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-19
Junio C Hamano
G
it 1
.
7
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-19
Jun
i
o C
H
a
mano
Mer
g
e
b
r
a
n
ch 'tr/xsize-bits
'
in
t
o maint
commit
|
commitdiff
|
tree
2010-08-19
Junio
C
Hamano
Merge
b
r
anch
'
jc/s
h
a
1
-
name-find-fix' i
n
to maint
commit
|
commitdiff
|
tree
2010-08-19
Æ
v
ar Arnfjörð Bja
r
maso
n
t
/
t9010-svn-fe
.
sh: add an +x bit
t
o this tes
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Junio C
Hamano
M
erge b
r
anch 'sp/
f
ix-sm
a
rt-http
-
deadlock
-
on-
e
r
r
or'
.
.
.
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge
scrip
t
: learn --[no-]rerere-autoupdate
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Nieder
merge script: notice @{-1} sho
r
t
hand
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
at
h
an Nie
d
er
m
erge script: handle --no-ff --n
o
-commit
c
orrectly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
onat
h
an N
i
eder
merge script:
-
-ff-
o
nly t
o
di
s
a
l
low
t
r
u
e merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nied
e
r
merge
script
:
ha
n
dle many-way oct
o
p
u
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
de
r
merge script: handle -m --log correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan Nieder
mer
g
e script: forbid merg
e
-s index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge script: al
l
ow custom strategies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
de
r
merge script: merge -X<opt
i
on
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
de
r
m
e
rge script: i
m
pro
v
e log me
s
sage subject
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
ona
t
han
N
i
e
de
r
merge script: refuse to
m
erge
during merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
der
merge script: twe
a
k unm
e
rged fil
e
s message to
match
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Nieder
merge script
:
--squash, --ff from unborn bra
n
ch are
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan Ni
e
der
fmt-m
e
rge-msg -m to
o
verride merg
e
tit
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
eder
me
r
ge-ba
s
e --in
d
ependent
to prin
t
reduced paren
t
list
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
eder
merge
-
base
--octopus to
m
imic show
-
branch --merge-base
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Niede
r
D
o
cumentation: add a S
E
E ALS
O
secti
o
n for merge-base
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Niede
r
t6
2
0
0
(
f
mt-merge-msg): style ni
t
p
ick
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ied
e
r
t6010 (merg
e
-base
)
:
mo
d
erni
z
e st
y
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next