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
git-mv: fix moving more than one source to a single destination
2010-01-22
Junio C
Ham
a
no
git-mv: f
i
x mov
i
n
g
more than one
source to a single
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Junio C Ha
m
a
n
o
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-01-22
Junio C Hamano
merge-recursiv
e
: do not
r
e
tu
r
n
NULL only
t
o cause segfault
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
c
o
n
f
l
i
ct-mark
e
r-size: add
test and docs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
J
unio
C H
a
mano
Up
d
ate draft release notes
to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Ham
a
no
Merge branch 'bw/cvsimport'
commit
|
commitdiff
|
tree
2010-01-21
J
uni
o
C
Hamano
M
erge branch 'jc/checkout-
m
er
g
e-ba
s
e'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Hamano
Merg
e
bra
n
ch 'ag/patch-header-verify'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Hamano
Mer
g
e
b
r
a
nch 'jc/conflict
-
marker
-
s
i
ze'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C
H
a
mano
Mer
g
e branch 'a
g
/maint
-
a
p
ply-too-large-p'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Haman
o
Merge b
r
a
n
ch 'ap/merge-b
a
ckend-opts'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merg
e
branch 'nd/status-part
i
al-
r
efresh
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
a
m
a
n
o
Merge
re
m
ote
b
ranch 'remotes/trast-doc/for-next'
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
man
o
Merge branch 'jh/notes'
(
ea
r
l
y
part
)
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Haman
o
Me
r
ge branc
h
'main
t
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
mano
Mer
g
e branch
'
jc/ma
i
nt-ref
r
esh-i
n
dex-is-
o
p
tional-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
b
ranch '
r
r/core-tutorial'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
M
e
rge bra
n
c
h 'jc
/
c
a
che-u
n
merge
'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Me
r
ge branc
h
'js/exec-error-re
p
o
rt'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Merge b
r
a
n
ch 'jc/ls-files-ignored-path
s
pec'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
Hamano
Me
r
g
e
branch 'jc/grep-loo
k
ahead'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Merge bran
c
h
'j
c
/maint-st
r
b
uf-add-
f
ix-dou
b
ling'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Merge branch 'mm
/
conflict-advice'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Ha
m
ano
Merge br
a
nch 'da
/
diff
t
ool'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o C Ham
a
no
Merge
branch 'mh/
r
ebase-
f
ixup'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Merge branch 'ns/r
e
base-auto-squas
h
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'mh/r
e
base-
f
ixup' (early par
t
)
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merge branch 'il
/
pu
s
h-set-ups
t
r
eam'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Merge branch 'jk/
w
arn-author-committer-afte
r
-commit'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Ha
m
ano
M
e
rge branch 'jc/id
e
nt
'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge branch 'tr/
h
t
tp-pu
s
h-ref-st
a
tus'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Merge
b
ranch 'bk/fix-rel
a
tive-gi
t
dir-f
i
le'
commit
|
commitdiff
|
tree
2010-01-20
J
u
ni
o
C Hamano
Merge b
r
a
n
c
h 'sd/cd-p
-
show-toplevel'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Ha
m
ano
M
e
rge branch 'jc/sy
m
bol-stat
i
c
'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
date
.
c: mark file-local function static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C H
a
mano
Sync with 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Git
1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge br
a
nc
h
'bg/maint-remote-up
d
ate-
d
efa
u
lt' int
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Merge
branch 'sb/m
a
int-octo
p
us' into mai
n
t
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Ham
a
no
Mer
g
e branch
'bg/maint-add-all-
d
o
c
' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'maint
-
1
.
6
.
5' i
n
to
maint
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C H
a
mano
Git 1
.
6
.
5
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Me
r
ge br
a
nch 'jk/ma
i
nt-1
.
6
.
5-r
e
set-h
a
rd' into
m
a
i
n
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
r
ge branch 'tr/maint-1
.
6
.
5
-bas
h
-prompt
-
show-
s
ub
m
odule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e
branch 'dp/maint
-
1
.
6
.
5-fast
-
import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Merge bran
c
h 'jm/main
t
-1
.
6
.
5-g
r
ep-NUL-termina
t
e'
int
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Fix "checkout A
.
.
.
" synonym for "checkout A
.
.
.
HEAD
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
status: don't requi
r
e
the
r
epo
s
i
t
ory
t
o
be writable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Merge bran
c
h
'
ma
i
nt'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
H
a
mano
Merge branch '
m
aint-1
.
6
.
4' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
Merge br
a
nch 'mai
n
t-1
.
6
.
3
' into maint
-
1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
m
ano
M
erge branch 'maint-
1
.
6
.
2'
into maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
Merg
e
commit 'v1
.
6
.
4
.
4
-
8-g8de6518' into
m
aint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
Fix mis-backport of
t700
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
m
a
n
o
Update dr
a
ft release note
s
to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
i
o C Hamano
Mer
g
e
branch 'maint
'
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Update dra
f
t r
e
le
a
se notes to
1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
Merge branc
h
'dp/maint-1
.
6
.
5-fast-impo
r
t-non-comm
i
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Hamano
Merg
e
br
a
nch '
j
c/re
r
ere'
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Hamano
Merg
e
branch
'
p
c/
u
ni
n
t
e
resting-sub
m
odule-disappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o
C
Hamano
Merge branch 'nd/include-termi
o
s-for-oso
l
'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge
br
a
nch 'js/windows'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
M
e
rge branch 'jm/main
t
-1
.
6
.
5-grep-NUL-termina
t
e' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio C H
a
m
ano
symlinks
.
c
: remove u
n
used functio
n
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ham
a
no
object
.
c: remove unused
f
unctions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Document that merge str
a
tegies can now take the
i
r o
w
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ha
m
ano
Make "s
u
btree" part more ort
h
ogonal to the rest of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
un
i
o C Hamano
p
ull: Fi
x
p
a
r
s
ing of -X<op
t
ion>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Hamano
Update dr
a
ft release notes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Merge br
a
n
ch
'
tc/test-locate-httpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Merge bran
c
h 'jh/co
m
mit-status'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
Merge branch 'jn/
m
akef
i
le'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Ha
m
ano
Merge branch 'jc/maint-1
.
6
.
1-chec
k
o
u
t-
m
-custo
m
-merge'
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
i
o
C
Hamano
Merge branch 'tc/clone-v-progress'
commit
|
commitdiff
|
tree
2010-01-17
J
unio C
Hama
n
o
Me
r
g
e
branch 'tc
/
smart-http-restric
t
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
Merge
b
ranc
h
'jk/run
-
com
m
and-use-shell'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
Mer
g
e
branc
h
's
r
/g
f
i-opt
i
o
ns'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C H
a
mano
Update COPYING
w
ith GPLv2 with new FSF address
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C Hamano
u
s
e
r_ident_su
f
ficientl
y
_given(): refactor the lo
g
i
c
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C
Hamano
use
r
_ident_
s
ufficiently_given(
)
: refact
o
r the logi
c
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
io C
H
amano
rerere
:
honor con
f
lict-marker
-
size att
r
ibute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
rer
e
re: prepare for cu
s
tomiza
b
le conflict m
a
rker length
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio
C
Hamano
commit
.
c:
:
print_sum
m
ary: d
o
n
ot rele
a
se
the fo
r
mat
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
H
ama
n
o
co
n
flict-marker-size:
new attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
i
o
C
Hamano
rerere
:
use
l
l_me
r
ge() instead of
using
xdl_
m
erge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
m
e
r
ge-tree: use
l
l_m
e
rge(
)
not xdl_merg
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl
_
merg
e
():
a
llow
p
assing dow
n
m
a
rker_size i
n
xmparam_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_merge(): introduce xmpa
r
am_t f
o
r
merg
e
s
pecif
i
c
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
git_attr(): fix function
signature
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
i
o
C Ha
m
ano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Ham
a
n
o
M
e
rge bran
c
h
'cc/reset-mo
r
e'
commit
|
commitdiff
|
tree
2010-01-15
Junio C Hamano
grep --
n
o-ind
e
x: allow
u
se of "git g
r
ep" out
s
ide
a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-15
Junio C Hamano
grep: prep
a
re t
o
ru
n
o
u
ts
i
de of
a
work tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge bra
n
ch 'jc
/
chec
k
out-merge
-
base'
commit
|
commitdiff
|
tree
2010-01-13
Jun
i
o C Hamano
Merge bra
n
ch '
r
s/main
t
-arch
i
ve-match-paths
p
ec'
commit
|
commitdiff
|
tree
2010-01-13
Junio C
H
amano
Merge branch 'il/vcs-he
l
per'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
st
r
buf_a
d
dbuf(): al
l
ow pass
i
ng the
s
ame buf
t
o
dst
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Mer
g
e
bran
c
h
'cc/reset-more'
commit
|
commitdiff
|
tree
2010-01-13
J
unio C Ha
m
ano
Merge
b
ran
c
h 'nd/sparse'
commit
|
commitdiff
|
tree
2010-01-13
Junio C
Hamano
t7
5
02:
tes
t
com
m
it
.
status, --st
a
tus and --no-stat
u
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next