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
Merge branch 'ml/maint-grep-doc' into maint
2010-01-23
Junio C Hamano
Merge branch
'
i
l
/
r
emot
e
-updates'
commit
|
commitdiff
|
tree
2010-01-23
Junio C
H
aman
o
Merge branch
'i
l
/branch-set-upst
r
e
a
m'
commit
|
commitdiff
|
tree
2010-01-23
Junio C Hamano
Merge
branch 'jc/maint-limit
-
no
t
e-outp
u
t'
commit
|
commitdiff
|
tree
2010-01-23
Junio C Hamano
Me
r
ge branc
h
'
n
d/
l
s-
f
iles-sparse-fix'
commit
|
commitdiff
|
tree
2010-01-22
Juni
o
C Hamano
i
gnore d
u
plicated sl
a
shes
i
n
ma
k
e_r
e
l
ative_
p
ath()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Juni
o
C Ham
a
no
git-
m
v: fix mov
i
ng more than one sou
r
ce to
a
single
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Jun
i
o C
H
amano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-01-22
Junio C Hamano
merge-recursive: do not return NULL o
n
ly to
c
ause
s
egfault
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio
C Hamano
Fix "log
--
o
neline" no
t
to show no
t
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hama
n
o
conflic
t
-
m
ark
e
r-size: add test and docs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
i
o C Ha
m
a
n
o
U
p
d
a
te draft
rel
e
ase notes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hama
n
o
Merge bran
c
h 'bw/cvsimport'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Hamano
Merge
branch
'
jc/c
h
e
c
k
ou
t
-merge-base'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Hamano
Me
r
g
e branch
'
ag/pa
t
ch-h
e
ader-verify'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Haman
o
Merge branch '
j
c/conflict-marker-size'
commit
|
commitdiff
|
tree
2010-01-21
J
u
n
io C Hamano
M
erge branch 'ag/mai
n
t-apply-to
o
-la
r
ge-p'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Haman
o
Merge branch '
a
p/
m
er
g
e-backend-opts'
commit
|
commitdiff
|
tree
2010-01-21
J
unio
C
Ham
a
no
Merge bran
c
h
'nd/statu
s
-
p
artial-refresh'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge remote branc
h
'
r
e
m
o
tes/trast-doc/for-n
e
xt'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Ha
m
a
n
o
Merge branc
h
'
jh/notes' (early part)
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge b
r
an
c
h 'maint'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Ha
m
ano
Merg
e
branc
h
'
j
c/maint-refresh-index
-
i
s
-optiona
l
-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Ham
a
no
Fix "l
o
g" family
not to be too agressive
about showin
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
u
ni
o
C Hamano
Merge b
r
a
n
ch 'rr/core-tutorial'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'jc/cache-unmer
g
e'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C
Ha
m
a
n
o
Merge branch 'js
/
exe
c
-error-repor
t
'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C Hamano
Merge b
r
anch
'jc
/
ls-fi
l
es-igno
r
ed-path
s
pec'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branc
h
'
j
c/grep-lookahead'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'j
c
/mai
n
t-str
b
uf-add-fix-doub
l
i
n
g'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge
b
ranch 'mm
/
con
f
lict-advic
e
'
commit
|
commitdiff
|
tree
2010-01-20
J
uni
o
C H
a
m
a
no
Merge
b
r
a
nch 'da/diffto
o
l'
commit
|
commitdiff
|
tree
2010-01-20
J
unio
C Haman
o
M
e
rge branch 'mh/reb
a
se-fixup'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merg
e
branch 'ns/rebase
-
auto-sq
u
a
s
h'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Ham
a
no
Merge b
r
anch 'mh/rebase-fixup' (early part)
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
M
e
r
ge
bra
n
ch 'il/push-set-upstream'
commit
|
commitdiff
|
tree
2010-01-20
J
u
ni
o
C Hamano
M
e
rge branch 'jk/w
a
r
n
-
a
utho
r
-committe
r
-after-
c
omm
i
t'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
er
g
e
b
ranch 'jc/id
e
nt'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Merge branc
h
'tr/ht
t
p-push-re
f
-status'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C
H
amano
Merge branch 'bk/fix
-
re
l
ative-gitdir-f
i
le'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C H
a
mano
Mer
g
e
branch 'sd/
c
d-p
-
show-toplevel'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Ham
a
n
o
Merge branch 'jc/symbol-static'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
date
.
c:
m
ark file-local function
s
tatic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
S
y
nc with
1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C H
a
mano
Git 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
M
erge bran
c
h 'bg/maint-remote-upda
t
e-defau
l
t' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'sb/maint-
o
ctop
u
s' in
t
o
m
a
i
nt
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hama
n
o
Merge branch
'bg/mai
n
t
-
add-
a
ll-do
c
' into
m
aint
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
i
o C Haman
o
Merge branch 'main
t
-1
.
6
.
5'
i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Git 1
.
6
.
5
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Me
r
ge
branch 'jk/mai
n
t-1
.
6
.
5-reset-hard' into m
a
i
nt
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
m
ano
M
erg
e
b
r
anch 'tr/maint-1
.
6
.
5-bash
-
prompt-show-su
b
mo
d
ule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
i
o C Hama
n
o
Me
r
g
e branch 'dp/
m
aint-1
.
6
.
5
-fast-import-non-comm
i
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio C
H
a
mano
Merge bra
n
ch 'jm/mai
n
t-1
.
6
.
5-grep-
N
UL
-
termina
t
e
' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Teac
h
@
{
u
p
strea
m
} syntax to
s
t
rb
u
f_branchanme()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Haman
o
t15
0
6:
m
ore
t
es
t
for @{ups
t
ream} syntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
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
Junio C Hama
n
o
status: d
o
n't re
q
u
i
r
e the reposi
t
ory t
o
be w
r
it
a
ble
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio
C
Hamano
Merge bran
c
h '
m
aint'
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio
C Hamano
Merg
e
branch
'maint-
1
.
6
.
4' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merg
e
branch '
m
aint-1
.
6
.
3' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hamano
Merge bra
n
c
h
'mai
n
t-1
.
6
.
2' into maint
-
1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
M
e
rge commit 'v1
.
6
.
4
.
4-8
-
g8d
e
651
8
' in
t
o maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
F
i
x
mis-b
a
c
kport of
t700
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Ha
m
ano
Update draft release notes to
1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
no
M
e
rge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
U
p
date 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 Ha
m
ano
Merge
b
ranch 'dp/maint-1
.
6
.
5-fas
t
-im
p
ort-n
o
n-
c
ommit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C
H
amano
Merge branch 'jc/
r
erere'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
ano
Merge branch 'pc/unint
e
resting-submod
u
le-disappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge br
a
nch 'nd/include-termios-for-osol'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge
b
ranch 'js/windows'
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
M
erge br
a
nch 'jm/maint-1
.
6
.
5-grep-NUL-termin
a
t
e' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ham
a
no
symlinks
.
c: remo
v
e unused funct
i
ons
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C
H
amano
ob
j
ect
.
c: remove unused functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ham
a
no
Doc
u
ment that m
e
rge strategies c
a
n
now
take
t
heir own
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io C Ham
a
no
Make "su
b
tree" pa
r
t more
ort
h
ogonal to the res
t
of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o C Haman
o
pul
l
: Fi
x
p
arsing
o
f -X<optio
n
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
u
ni
o
C Hamano
Updat
e
draft
release
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 branch
't
c
/test-locat
e
-h
t
tpd'
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C Hamano
Merge branch 'j
h
/
commit-sta
t
us'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
Merge bran
c
h 'jn/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Haman
o
Merg
e
branch 'jc/maint-1
.
6
.
1
-checkout-m-custom-merge'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
H
a
mano
M
e
rg
e
branch 'tc/clone-v-progress'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C
Hamano
Me
r
ge br
a
n
c
h 'tc/smart-http
-
restrict'
commit
|
commitdiff
|
tree
2010-01-17
J
un
i
o C Hamano
Merge branch '
j
k/run-command-
u
se
-
shell'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C
Ham
a
no
Merge
b
ranch 's
r
/gfi-opti
o
ns'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
U
p
date CO
P
YING with GP
L
v2 with new FSF a
d
dress
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
u
ser_ident_suf
f
icientl
y
_g
i
ven(): refact
o
r the lo
g
ic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
i
o C Haman
o
user_ident_suf
f
ic
i
en
t
ly_giv
e
n
(): refactor the
l
ogic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Haman
o
rerere:
h
onor conflict-marker-size attribu
t
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
re
r
er
e
:
prepare for
c
u
sto
m
iz
a
ble co
n
fl
i
ct m
a
rker length
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Ham
a
no
commit
.
c::print_summary: do
not release the format
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
a
m
ano
conflict-
m
arker
-
size: new attrib
u
t
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Ham
a
no
r
erere: use ll_merg
e
() instead of using xdl_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
m
e
rge-tr
e
e: u
s
e ll_merge() no
t
xdl_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hama
n
o
x
dl_merge():
a
llow pas
s
ing dow
n
m
a
rker
_
size in
xmpa
r
am_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
xdl_merge(): introduce
xm
p
aram
_
t for mer
g
e spe
c
ifi
c
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
git_attr(
)
: fix funct
i
on s
i
gn
a
ture
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C Hamano
Merge
br
a
nch 'cc/r
e
se
t
-more'
commit
|
commitdiff
|
tree
next