repo.or.cz
/
tgit.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 Hamano
git-mv:
fix movin
g
more than o
n
e
s
ource to a single
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Junio C Hamano
Merg
e
branch
'
maint'
commit
|
commitdiff
|
tree
2010-01-22
J
unio C H
a
mano
m
erge-recu
r
s
i
ve: do not
r
eturn
NULL only to ca
u
se
s
egfaul
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
J
unio
C
Hama
n
o
c
o
n
f
lict-mark
e
r-siz
e
: add
t
est and docs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Hamano
Update draft release note
s
to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Hamano
Merge br
a
nch
'
b
w/cvsimport'
commit
|
commitdiff
|
tree
2010-01-21
J
u
n
i
o
C
Haman
o
Me
r
ge br
a
nch 'jc/ch
e
c
k
out
-
merge
-
base'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Hamano
Merge branch 'ag/patch-header-ve
r
ify
'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Ham
a
no
Merge
bra
n
ch 'jc/conflict-marker-size'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hama
n
o
Merge branch 'ag/m
a
in
t
-apply-to
o
-
l
arge-p'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
erge branch 'ap/m
e
r
ge-backend-opts'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Me
r
g
e
branch 'nd/status-part
i
al-re
f
resh'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge
r
em
o
te branch 're
m
otes/trast
-
d
o
c/for-next'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branch 'jh/notes'
(
e
arly
p
art
)
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-21
J
unio C
Hamano
Merge branch
'
jc/
m
aint-
r
efresh-index-is-opti
o
nal-fo
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merge branch 'rr/c
o
r
e
-tutorial'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
M
e
r
ge bra
n
ch 'jc/cache-unmerge'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Ham
a
no
Merge b
r
anch
'
j
s
/exec-error-report'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge branch 'j
c
/ls-files-
i
gnor
e
d-pathspec'
commit
|
commitdiff
|
tree
2010-01-20
J
uni
o
C Ham
a
no
Merge branch
'
jc/gre
p
-l
o
okahea
d
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Merge branch 'jc/maint-strbuf-a
d
d-
f
ix-d
o
ubling'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio
C
Hamano
Merge br
a
nch 'mm/conflict-ad
v
ice'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
i
o
C Ham
a
no
Merg
e
b
ranch 'da/difft
o
ol'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
bran
c
h
'mh/rebase-fixup'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
man
o
Mer
g
e branch
'ns/rebase-a
u
to-squash'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Mer
g
e
b
ran
c
h 'm
h
/rebase-fi
x
up'
(e
a
rly part)
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C H
a
man
o
Mer
g
e branch 'il/
p
ush-s
e
t
-
upstream'
commit
|
commitdiff
|
tree
2010-01-20
J
uni
o
C Ha
m
ano
M
e
r
ge
br
a
nch 'jk/warn-au
t
ho
r
-co
m
mitte
r
-after-commit'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
i
o C Hamano
Merge
b
r
anch
'jc/ident'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Me
r
ge branc
h
'tr/http-push-re
f
-st
a
tus'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Merge
b
r
anch 'bk/fix-rel
a
t
i
ve
-
gitdir-fi
l
e'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
aman
o
Merge
b
ra
n
c
h 'sd/cd-p-show-toplevel'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Me
r
ge b
r
a
n
c
h 'jc/symbol-
s
tatic'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
date
.
c: mark f
i
le-lo
c
al function stat
i
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Sync
w
ith
1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio 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 branch 'bg/maint-remote-update-default' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge b
r
anch 'sb/maint-
o
ct
o
pus' into ma
i
nt
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C
Hamano
Merge branch '
b
g
/
maint-add-al
l
-doc' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Merge branc
h
'maint-1
.
6
.
5' into mai
n
t
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
Junio C Ham
a
no
Merge branch 'jk/maint
-
1
.
6
.
5-res
e
t-hard' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bran
c
h 'tr/ma
i
nt-1
.
6
.
5-
b
ash-prompt-show-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Merge branch 'd
p
/main
t
-1
.
6
.
5-fast
-
import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C H
a
man
o
Merge
b
r
a
n
ch 'jm
/
maint-1
.
6
.
5-grep-NUL-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Fix "checkout A
.
.
.
"
s
ynonym for "c
h
e
c
kout A
.
.
.
HEAD
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Ham
a
no
statu
s
:
d
o
n't requ
i
re the repo
s
it
o
ry to
b
e
writab
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
i
o
C Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge
branch 'maint-1
.
6
.
4' into ma
i
nt-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
J
unio
C Hamano
M
e
rge branch 'maint-1
.
6
.
3'
into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merg
e
branch
'
maint-1
.
6
.
2' in
t
o maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hama
n
o
Merge commit 'v1
.
6
.
4
.
4
-
8-g8de6518' into ma
i
n
t
-
1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Haman
o
Fix mis-backport of
t
700
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
Update draft
releas
e
notes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
M
erge
branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C
Hamano
Update draft release 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 bran
c
h 'dp/maint-1
.
6
.
5-fast-import-non-com
m
it
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Mer
g
e branch 'jc/re
r
ere'
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
amano
M
erge branch '
p
c/unin
t
eresting-submodule
-
disappe
a
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
M
e
rge
b
r
anch 'nd/include-termios-for-osol'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
Merge br
a
nch 'js/window
s
'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hama
n
o
Merge
b
ranch
'jm/main
t
-
1
.
6
.
5
-
grep-N
U
L-terminat
e
' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
J
unio C H
a
mano
symlinks
.
c: remove unused fun
c
tions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
unio
C
Hama
n
o
object
.
c: remove unused functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C
H
amano
Document th
a
t
m
erge strategies can now take
t
heir own
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
unio
C
Hamano
Make "sub
t
r
e
e" part
more ort
h
ogonal to
t
he res
t
of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ha
m
ano
p
u
ll
:
Fix p
a
rsing of
-X<option>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
unio C
H
a
m
ano
Update
draft r
e
l
ease not
e
s
t
o
1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hama
n
o
Merge bran
c
h 'tc/t
e
st
-
lo
c
ate-httpd
'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
M
erge
branch 'jh/com
m
it-st
a
tus'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
M
er
g
e
branch
'j
n
/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
M
e
rge branch 'jc/maint-1
.
6
.
1-checkout-m-cus
t
om-merge'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C H
a
m
a
n
o
Merge br
a
nch 'tc/clo
n
e
-
v-
p
rogress'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
Merge
branch '
t
c/smart-http-re
s
tr
i
c
t'
commit
|
commitdiff
|
tree
2010-01-17
J
u
ni
o
C Ham
a
no
Merge b
r
a
n
ch '
j
k/run
-
c
o
mmand-us
e
-s
h
ell'
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
Merg
e
branch 's
r
/g
f
i
-options'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
Upd
a
te COPY
I
NG with GPLv2 w
i
th new FSF address
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
use
r
_ident_sufficient
l
y_given(): refa
c
tor the logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
use
r
_ide
n
t_sufficient
l
y
_
g
i
v
e
n(
)
: refactor
t
he logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rere
r
e: honor
c
onflict-marker-size at
t
ribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
rerere: pr
e
pare for custo
m
iza
b
le con
f
lic
t
mar
k
er length
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
commi
t
.
c::
p
rint_summ
a
ry:
d
o
n
ot release the form
a
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C H
a
mano
conflict-marker-si
z
e: new
a
tt
r
ibute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hama
n
o
r
e
rere:
u
se ll_merge()
in
s
t
e
a
d
o
f
u
sing xdl_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
merge-t
r
ee: use ll
_
m
erge()
n
o
t
x
dl_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C
Hamano
xdl
_
merge(): al
l
ow
p
a
ssing down marker_size i
n
x
m
param_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
n
o
xdl_merge(): introduce xmparam_t for
m
erge spe
c
ific
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
gi
t
_attr(): fix function si
g
nature
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge br
a
nch
'maint'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C H
a
m
a
no
Merge branch '
c
c/
r
eset-more'
commit
|
commitdiff
|
tree
2010-01-15
J
u
nio C Hama
n
o
g
rep --no
-
i
ndex
:
a
llow us
e
of "g
i
t grep
"
outside a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-15
Junio C Ham
a
no
g
rep: prepare
t
o run
outsi
d
e of a
wo
r
k tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
io C
Hama
n
o
Merg
e
bra
n
ch 'jc
/
checkout-merge
-
bas
e
'
commit
|
commitdiff
|
tree
2010-01-13
Juni
o
C
Hama
n
o
Merge branch 'rs/maint-archive-
m
atch-pathspec'
commit
|
commitdiff
|
tree
2010-01-13
Jun
i
o C Ham
a
no
M
e
rge branch
'
il/vcs
-
hel
p
er'
commit
|
commitdiff
|
tree
2010-01-13
J
u
nio C
H
a
mano
strbuf_
a
ddbuf(
)
: allow pas
s
i
n
g th
e
same b
u
f
to dst
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
J
uni
o
C Hamano
M
e
r
ge bra
n
ch 'cc/
r
eset-mo
r
e'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge b
r
anch
'n
d
/sparse'
commit
|
commitdiff
|
tree
2010-01-13
Junio C
H
a
man
o
t7502:
t
est commit
.
status, --status and --no-status
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next