repo.or.cz
/
git
/
jnareb-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 'jc/checkout-merge-base'
2010-01-21
Junio C H
a
mano
Merge branch '
j
c
/checkout-me
r
ge-base
'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o
C
H
amano
Merge branch 'a
g
/patch-header-
v
erify'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Me
r
ge branc
h
'jc/confl
i
ct-ma
r
ker-size'
commit
|
commitdiff
|
tree
2010-01-21
J
unio
C Hamano
Merge bra
n
ch 'ag/mai
n
t
-
a
pply-to
o
-l
a
rge-p'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
H
a
ma
n
o
Merge b
r
anc
h
'ap/merge-backend
-
opts'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branch
'
n
d/stat
u
s-partial-refresh'
commit
|
commitdiff
|
tree
2010-01-21
J
u
n
i
o C Ham
a
no
Merge remote branch 'remotes/trast
-
doc/
f
or-next'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Hamano
Merge branch '
j
h
/notes' (
e
a
rly
p
a
r
t)
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o
C
Hamano
Mer
g
e branch
'
m
ai
n
t'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ha
m
ano
M
e
rge branch 'jc/maint-refre
s
h
-
index-is-option
a
l-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Merge branch '
r
r/core-t
u
torial'
commit
|
commitdiff
|
tree
2010-01-20
J
uni
o
C Hamano
Merge branch 'jc/cache-unmerge'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Mer
g
e bran
c
h 'js/exec-er
r
or-
r
e
port'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merg
e
b
r
anch '
j
c
/
l
s
-
files-ign
o
r
e
d-pathspec'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rge
branch 'jc/gre
p
-look
a
head'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hama
n
o
Merge branch 'jc/maint-strb
u
f-add-f
i
x-
d
o
u
bl
i
n
g'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Me
r
ge branch 'mm/conflict-advice'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Ham
a
no
Merge branch 'da/d
i
ff
t
ool'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Merge branch
'
mh/
r
e
base-fixup'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rge bran
c
h 'ns/
r
ebas
e
-
a
u
to-squash'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merg
e
b
r
a
n
c
h 'mh/rebase-fixup'
(early part)
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Merge
b
r
a
nch
'il/push-se
t
-upstream'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
m
ano
Merg
e
branch
'jk/warn-author-com
m
itter-after-
c
ommit
'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Ham
a
no
Merge br
a
nch 'jc/i
d
e
n
t'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'tr/http-push
-
ref-status'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Merge
branch 'bk/fix-relative-gitdir-
f
ile'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Haman
o
Merge branc
h
'
s
d/
c
d-p-s
h
ow-toplevel'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o
C
Ha
m
a
n
o
M
erge branch 'jc/sym
b
o
l
-
stati
c
'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C H
a
mano
d
a
te
.
c:
mark
f
ile-local
fun
c
tion
st
a
tic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Sync with
1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Git 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merge bra
n
ch 'bg/mai
n
t-r
e
mo
t
e-update-default' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Mer
g
e bra
n
c
h 'sb/maint-octopus' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Me
r
ge bra
n
ch 'bg/mai
n
t-add-all-doc' into main
t
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
branch 'maint-1
.
6
.
5' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Git 1
.
6
.
5
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merge
b
ranch 'jk
/
mai
n
t
-
1
.
6
.
5-reset-hard' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
aman
o
M
erge branch 'tr/maint-1
.
6
.
5
-bash-pro
m
pt-show-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Me
r
g
e
b
ranch 'dp/main
t
-1
.
6
.
5-fast-imp
o
rt-non-
c
ommit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Ha
m
ano
Merge
b
ranch 'jm/maint-1
.
6
.
5
-
gr
e
p-N
U
L
-
ter
m
i
n
a
te' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Fix "c
h
e
c
kout A
.
.
.
" synonym for "checkout
A
.
.
.
HEAD
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
status:
don't require the
repo
s
itory to
b
e writa
b
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C
Hamano
Me
r
ge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
J
o
ha
n
nes Sixt
M
akefile: honor NO_C
U
RL w
h
en set
t
ing REMOTE_C
U
R
L
_
*
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Tarmigan Casebolt
ident
.
c
:
r
eplace
f
p
r
intf with fputs to suppr
e
ss compiler
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
N
guyễn Thái Ngọc Duy
rm: only refresh entries tha
t
we may touch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
D
a
vid R
i
p
t
on
b
i
sect: fix
sin
g
ular
/
plural gramm
a
r nit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
M
erg
e
branc
h
'maint-1
.
6
.
4'
i
nto main
t
-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Merg
e
bran
c
h 'maint-1
.
6
.
3' into
m
aint
-
1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
Merge branch
'
ma
i
nt-1
.
6
.
2
'
into maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Me
r
ge commit 'v1
.
6
.
4
.
4-8-g8de
6
5
1
8' in
t
o mai
n
t-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
Fi
x
m
is-backport of t7002
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Hamano
Update draft release notes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C
Hama
n
o
Mer
g
e bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Haman
o
Update dr
a
ft release notes
to 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
M
e
rge branch '
d
p/maint-1
.
6
.
5-f
a
s
t
-
import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
unio C H
a
mano
Merge branch 'jc/re
r
ere'
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
Me
r
ge
branch '
p
c/uninte
r
esting-subm
o
dule-disappea
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hamano
Merge branch 'n
d
/include
-
t
ermios-
f
or
-
oso
l
'
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hamano
M
e
rge
branch 'js/windo
w
s'
commit
|
commitdiff
|
tree
2010-01-19
Andreas Gruenba
c
he
r
bui
l
tin-apply
.
c: fix the ---
a
n
d +++ header f
i
lename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Da
n
i
el Barkalow
Replace parse_blob() with an
expl
a
n
atory comment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Hamano
Me
r
ge branch 'jm/maint-1
.
6
.
5-grep-NUL-te
r
m
i
nat
e
' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
im Meyering
grep: NUL term
i
nate i
n
put
from a file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Andre
a
s Gruenb
a
cher
builtin-apply
.
c: Skip filenames without enough components
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C Hamano
sy
m
links
.
c: remo
v
e unused functio
n
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C Hamano
object
.
c: rem
o
ve unused
funct
i
ons
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Documen
t
that merge str
a
t
egies can now take their own
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
A
very Penna
r
un
Exte
n
d
merge
-
s
u
btree te
s
ts to test -Xsubtree=di
r
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o C Hamano
Make
"subtree" part mo
r
e ortho
g
onal to the
r
e
s
t of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
un
i
o C H
a
mano
p
ull: Fix parsing
o
f -X<option>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pennaru
n
Teach g
i
t-pul
l
to
p
ass -X<option> to git
-
m
erge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Av
e
ry Pe
n
narun
git
m
e
r
ge -X<option>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Update draf
t
r
elease notes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ha
m
ano
Merge
b
ranch 't
c
/tes
t
-locate-
h
t
tpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Me
r
ge
b
ranch 'jh/commit-status'
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
Me
r
ge bra
n
ch 'jn/mak
e
file'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'jc/maint-1
.
6
.
1-checko
u
t-m-custom
-
merge'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
M
e
rg
e
bran
c
h 'tc/clone-v-progress'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Ham
a
n
o
M
e
rge branch
'tc/sma
r
t-
h
ttp-re
s
trict'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hamano
Merge branch 'jk/ru
n
-com
m
and-us
e
-
s
hel
l
'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io
C
Haman
o
Merge branch
'sr/gfi
-
op
t
ions'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
i
o C Hamano
Update COPYING with GPLv2
w
ith n
e
w
FSF
addr
e
ss
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
user_i
d
e
nt_suffi
c
iently_given(): refac
t
or the logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
use
r
_
ident_sufficiently_g
i
ve
n
(): refactor the logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
rerer
e
: honor conflict-mark
e
r-size
a
ttribut
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerer
e
: prep
a
re for customi
z
able conflict marker length
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hama
n
o
commit
.
c::print_summary: d
o
n
o
t rel
e
ase the format
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
conflict-mar
k
er
-
size: new att
r
ibute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
unio
C
Haman
o
r
e
re
r
e:
use
l
l_me
r
ge
(
) inste
a
d
o
f using
xdl_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
merge-tree: use ll_merge() no
t
x
d
l_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hama
n
o
x
d
l
_
merge(): allow passing down ma
r
ke
r
_s
i
ze in xmp
a
ram_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Ha
m
an
o
x
d
l_merge(): intr
o
d
uce xmparam_t for merge specific
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C
H
amano
git_attr(): fix
function signature
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
o
h
a
nnes Sixt
Do not use date
.
c:tm_t
o
_
t
i
me_t() fro
m
compat/m
i
ngw
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
A
n
drzej K
.
Ha
c
zewski
MSVC: Windows-native implementa
t
ion
f
or
s
ubset of Pthread
s
API
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
M
e
rge
branch
'maint'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
Merge b
r
a
n
ch 'cc/reset-more'
commit
|
commitdiff
|
tree
2010-01-17
Ram
k
u
m
ar
R
a
machan
d
ra
Documentat
i
o
n: Update git core tutorial c
l
arifying
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
R
am
s
ay Jones
MSVC:
F
ix an "incom
p
atibl
e
poin
t
er t
y
pe
s
" compiler
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next