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
conflict-marker-size: add test and docs
2010-01-21
Junio C Hamano
confl
i
ct-marke
r
-siz
e
: add test an
d
docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Update
dra
f
t re
l
ease note
s
to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Hamano
Merge b
r
anch '
b
w
/cvsimport'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Ha
m
ano
Merge branch
'
j
c/
c
h
e
ckout-merge-base'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branch
'ag/patc
h
-h
e
ader-verify'
commit
|
commitdiff
|
tree
2010-01-21
J
u
n
i
o C Ha
m
a
n
o
M
erge branch 'jc/con
f
lict-ma
r
ker-size'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o
C
Hamano
Merge br
a
nch 'ag/maint-apply-too-larg
e
-p'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
a
man
o
Merge branch 'ap/merge-backend-o
p
ts'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merg
e
branc
h
'nd/status
-
partial-
r
efresh'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hama
n
o
Merge remote branch 'remotes/trast-doc
/
for-
n
ext'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o
C
H
a
mano
M
e
rge bra
n
c
h 'j
h
/notes' (e
a
rly part)
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Haman
o
Merge
b
ran
c
h
'
m
aint'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge
b
ranch 'jc/maint-refre
s
h-
i
nd
e
x-i
s
-
o
ptional-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erge
b
ranch 'rr/
c
ore-tutoria
l
'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge branch 'jc/c
a
che-u
n
merge'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'js/exec
-
e
r
ror-report
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bran
c
h 'jc/
l
s-files-ignored-pathspec'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o
C
Hamano
Merge branch 'j
c
/gre
p
-l
o
o
kahead'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C H
a
mano
Merge
b
ranch 'jc/maint-str
b
u
f
-add
-
fi
x
-
dou
b
ling
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch '
m
m/con
f
lict-advice'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'da/difft
o
ol'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge
b
ranch
'
mh/rebase-fixup'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branc
h
'ns/rebase-auto-squash'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branc
h
'
mh/rebase-fi
x
up' (e
a
rly part)
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merg
e
branch 'il/p
u
sh-set
-
ups
t
ream'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merge branch 'jk/wa
r
n-a
u
thor-commi
t
ter-after-c
o
mm
i
t'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Haman
o
Merge branch 'jc/id
e
n
t'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Ha
m
ano
Merge
b
ran
c
h 'tr/http
-
p
ush-re
f
-
status
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rge bran
c
h '
b
k
/fix-relative-gitdir-file'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
amano
Me
r
g
e
branch 'sd/cd-p-show-t
o
plev
e
l'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C
H
amano
M
erge bra
n
ch 'jc/symbol-stati
c
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
dat
e
.
c: mark file-local function static
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
Junio
C Hama
n
o
Git 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
un
i
o C Hamano
Mer
g
e
branch 'bg/maint-remote-upda
t
e-default' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'sb/m
a
in
t
-oc
t
opus
'
into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
M
erge branch 'bg
/
maint-
a
dd-all-
d
oc' in
t
o maint
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C H
a
ma
n
o
Me
r
ge bran
c
h
'main
t
-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
Ju
n
io C
Hamano
Merge branch 'jk/maint
-
1
.
6
.
5-res
e
t-
h
ard' into m
a
int
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Me
r
ge br
a
nch 'tr/mai
n
t-1
.
6
.
5-bash-prompt-show-sub
m
odule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erge branch 'dp/maint-1
.
6
.
5-fas
t
-import-non-comm
i
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o C
H
a
m
ano
Merge b
r
anc
h
'jm/mai
n
t
-
1
.
6
.
5-grep-NUL-ter
m
inate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
n
o
Fix "checkout A
.
.
.
"
synony
m
for "checkout A
.
.
.
H
EAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
s
t
atus: do
n
't require t
h
e re
p
ository to b
e
w
r
i
ta
b
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
e
rge branch 'maint-1
.
6
.
4' into
maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch 'maint-1
.
6
.
3' into m
a
in
t
-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hamano
M
erge branch '
m
a
i
nt-1
.
6
.
2' i
n
to main
t
-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge
commit '
v
1
.
6
.
4
.
4-8-g8de6518' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
Fix
m
is-backport of t70
0
2
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
Junio C Haman
o
M
e
rg
e
branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio
C Hamano
Update draft
relea
s
e notes to 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge bra
n
c
h
'dp/maint-1
.
6
.
5
-
fast-impo
r
t-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio
C
Haman
o
M
e
r
g
e branch '
j
c
/
rerere
'
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Merge branch
'pc/unintere
s
ti
n
g-submo
d
ule-disappe
a
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
n
o
Merge bran
c
h 'nd/inc
l
u
d
e-ter
m
i
o
s-for-osol'
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o
C Hamano
Merge branc
h
'j
s
/windows'
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C
Hamano
Merge
b
ran
c
h 'jm/m
a
int-1
.
6
.
5
-
grep-NUL
-
terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
J
unio C Ha
m
ano
symlinks
.
c
: r
e
m
o
ve unused
functio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hama
n
o
object
.
c: remove unused fun
c
tions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o
C Hamano
D
o
c
u
ment that merge strategie
s
c
a
n
now
take th
e
ir
own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C Hamano
M
a
ke "
s
ubtree" part more orthogonal
t
o the rest of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C H
a
mano
p
ull: Fix parsing of -X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ham
a
n
o
Update draft release not
e
s to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Haman
o
Me
r
ge branch 'tc/test-locate-
h
t
t
pd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C H
a
m
a
no
M
e
rge branch 'jh/c
o
mm
i
t-
s
t
atus'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
Merge branch
'
jn/makefil
e
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
M
e
rge
b
ranch 'jc/mai
n
t-1
.
6
.
1
-
che
c
kout-m
-
custom-merge'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hamano
Merge b
r
anch
'
t
c/clone-v-progress'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge
b
r
a
nch
'tc/smart-http-restri
c
t'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge bra
n
ch 'jk/run-command-u
s
e-shell'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hamano
Merge branch 'sr/gfi-op
t
ions'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
Update COPYING with GPLv2 with ne
w
F
S
F address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
user_ident_suf
f
ic
i
en
t
ly_g
i
ve
n
(): refactor the
l
ogic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C Hamano
user_ident_suffic
i
ently_given(): refa
c
tor
t
he
logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Ham
a
no
rerere: hono
r
c
onf
l
i
c
t-marker-size attribut
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
io C Hama
n
o
rerere: pre
p
a
r
e for customizable conflict marker length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C
H
amano
co
m
mit
.
c::print_su
m
mary: do not rel
e
a
s
e t
h
e format
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio
C H
a
mano
conflict-marker-size: new at
t
r
i
bute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
r
er
e
re:
us
e
ll_mer
g
e
() i
n
stead
of usi
n
g xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C H
a
mano
m
e
r
ge-tree: u
s
e l
l
_merge()
n
ot xdl_me
r
ge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
xd
l
_merge(): a
l
l
ow pa
s
si
n
g down marker_size in x
m
param_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Ha
m
ano
x
dl_merge(): introduce xmparam_t fo
r
merge s
p
ecific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hamano
git
_
att
r
(
)
: fix function si
g
nature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge bran
c
h 'cc/reset
-
more'
commit
|
commitdiff
|
tree
2010-01-15
Junio
C Hamano
grep --no
-
index: al
l
ow use of
"
git grep" outsid
e
a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Junio C Hamano
gr
e
p: prepare
to run outside of a work tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
i
o
C Haman
o
Merge branch
'
jc/che
c
kout-merg
e
-base'
commit
|
commitdiff
|
tree
2010-01-13
Jun
i
o C Hamano
M
erg
e
b
ran
c
h
'rs/main
t
-archiv
e
-match-
p
a
t
hspec'
commit
|
commitdiff
|
tree
2010-01-13
Jun
i
o C Hamano
Merg
e
branch
'
il/
v
cs-helper'
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
io C Haman
o
strbuf_addbuf(): a
l
low passing the sa
m
e
b
uf to dst
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Ha
m
ano
Merge
branch
'
cc/res
e
t-mo
r
e'
commit
|
commitdiff
|
tree
2010-01-13
Junio C H
a
mano
Merge branch 'nd/sparse
'
commit
|
commitdiff
|
tree
2010-01-13
J
u
n
io C
H
amano
t7502: test c
o
m
mit
.
status
,
-
-
status and --no-status
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio
C
Hama
n
o
grep
:
rip out
pessimization to use fix
m
atch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C
H
am
a
no
grep: rip
o
u
t support for exte
r
nal grep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C H
a
mano
M
erge b
r
anch
'
mai
n
t'
commit
|
commitdiff
|
tree
next