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
Juni
o
C Ha
m
ano
conflict-mark
e
r
-
size: ad
d
test and docs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Hamano
Updat
e
draft
r
elease not
e
s t
o
1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branch 'bw/cvsimport'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Haman
o
Merge
b
ranch 'jc/
c
heckout-merge-ba
s
e'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Hamano
Merge branc
h
'
ag/patch-heade
r
-ve
r
i
f
y'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C
H
a
mano
M
e
rge
b
ranch 'jc/confl
i
ct-marker-size'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Ha
m
ano
Merge branch 'ag/maint-ap
p
l
y-too-la
r
g
e
-p'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Hamano
Merge
b
r
a
nch '
a
p/merge-backend-opts'
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Hamano
Merge branch 'nd/status-par
t
ial-refresh'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge
r
emot
e
branch 'remo
t
e
s/trast-doc/for-next
'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Hamano
M
erge bran
c
h 'jh/notes'
(
early part)
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C
H
amano
M
e
r
ge branch 'main
t
'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Ham
a
n
o
M
e
rge bran
c
h 'jc/maint-refres
h
-ind
e
x-is-
o
ptional-fo
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Merge branch 'rr/c
o
re
-
tutorial'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C
H
amano
Merge branch 'jc/cach
e
-unmerg
e
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Merge
branch 'js/exec-error-
r
e
p
ort'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
m
ano
Merge
b
ranch
'
jc/ls-files-ignored-pathspec'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C
H
amano
Merge br
a
n
ch
'
j
c
/
g
rep-looka
h
ead'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Merge branch 'jc/m
a
int
-
s
trbuf-add-fix-doublin
g
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Merge bran
c
h 'm
m
/conflict
-
advice'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
m
ano
Mer
g
e
branch
'
da/di
f
f
tool'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hama
n
o
Merge branch 'mh/r
e
base-f
i
xup'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
M
e
rge branch
'
ns/
r
ebase-aut
o
-squash'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge branch 'mh/rebase-fixup' (e
a
rly part)
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
M
e
r
ge branch 'il/push-set
-
upstream'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Me
r
ge branch 'jk/warn
-
author-committer-afte
r
-commit'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Merge
b
r
anch
'
j
c/ident'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io
C
Hamano
Me
r
ge branch 'tr/http-push-ref-status'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Ha
m
ano
Merg
e
branc
h
'bk/fix-relative-g
i
t
d
ir-file'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'sd/cd-p-sho
w
-toplevel'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e branch
'jc/symbol
-
static'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io
C Hamano
date
.
c: mark file-local fu
n
ctio
n
static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
S
y
n
c with 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
amano
Git
1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C
H
amano
Merge
branch 'bg/ma
i
n
t
-remote-update
-
d
efault'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bran
c
h
'sb/maint-octopus' into m
a
int
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C
H
a
m
ano
Me
r
ge branch 'bg
/
m
a
int-add-all-doc' into maint
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Merge branch 'maint-1
.
6
.
5' into main
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
Ju
n
i
o
C Hamano
Merge branch 'jk/mai
n
t-1
.
6
.
5-reset-hard' i
n
to maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
a
no
Merge branch
'
tr
/
m
a
int-1
.
6
.
5
-
bash-pr
o
mpt-show-s
u
b
m
odul
e
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Merge
br
a
nch
'
dp/maint-1
.
6
.
5
-
fast-i
m
port-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Me
r
ge branch 'jm/main
t
-1
.
6
.
5-grep-NUL-termina
t
e'
int
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
un
i
o
C Hamano
F
ix "checkout A
.
.
.
"
synonym for
"checkout A
.
.
.
HEAD
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
m
a
no
statu
s
: don't require
the reposit
o
ry to be
writable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Ha
m
ano
Merge branch 'maint-1
.
6
.
4' into ma
i
nt-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o
C H
a
m
ano
Merge
branch
'
m
aint-1
.
6
.
3'
i
n
t
o main
t
-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C
Hamano
Merge branch '
m
aint-1
.
6
.
2'
i
nto
m
ai
n
t-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Merge
com
m
it 'v1
.
6
.
4
.
4
-
8
-g
8
de
6
518'
into m
a
i
n
t-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Fix mis-backport
o
f t7002
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hamano
U
p
d
a
t
e draft
r
e
lease notes t
o
1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
no
U
pdate draft release notes to 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o
C
H
a
mano
Merge b
r
anch 'dp/maint-1
.
6
.
5
-fast-impor
t
-no
n
-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C
H
amano
Merge
b
ranch 'jc/rerere'
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
Merg
e
branch 'pc/uninterest
i
ng-submodule-disapp
e
ar
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
Merge branch 'nd/in
c
lude
-
termio
s
-for-oso
l
'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
ano
Merg
e
branc
h
'js
/
windows'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Merge
b
ran
c
h 'jm
/
mai
n
t
-1
.
6
.
5
-grep
-
NUL-te
r
mina
t
e' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hama
n
o
symlinks
.
c: remov
e
unused functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ha
m
a
n
o
obje
c
t
.
c
: remove unused functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
u
n
io C Hamano
Documen
t
that merge strategies can now take their own
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
aman
o
Make "subtree"
p
art more ort
h
ogo
n
al to t
h
e rest of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ham
a
no
p
u
ll: Fix parsi
n
g of -X<option>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Update d
r
aft release notes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
M
erge br
a
nch
't
c
/test-lo
c
ate-httpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
M
erge br
a
nch 'jh/commit-statu
s
'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
M
er
g
e b
r
a
n
ch 'jn/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hamano
M
e
r
ge
b
r
anch
'
jc/mai
n
t
-
1
.
6
.
1-checkout-m-cust
o
m
-merge'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Ha
m
ano
Merge bra
n
ch 't
c
/clo
n
e-v-progress'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hamano
Merge branch '
t
c
/
s
ma
r
t
-
http-restrict'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Haman
o
Me
r
ge branch 'jk/r
u
n-co
m
mand-use
-
shell'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch '
s
r/g
f
i-opt
i
ons'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
U
p
da
t
e C
O
PYING
w
ith
GPLv2 with
n
ew
FSF
address
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
use
r
_ident_sufficiently_gi
v
e
n(): refactor the logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hama
n
o
user
_
ident_sufficien
t
ly_given()
:
refa
c
t
or the logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C
Hamano
rerere: hon
o
r conflic
t
-marker-size attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rer
e
re
:
p
r
ep
a
re for customizable conflict m
a
r
ker length
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
commit
.
c
:
:print_summary: do
not release the form
a
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
c
o
nfli
c
t
-marker-siz
e
: new attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C
H
amano
rerere: use ll_
m
er
g
e() i
n
stead of usin
g
x
dl_me
r
ge
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
me
r
ge
-
tree: use ll_
m
erge() no
t
xdl_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
xdl_merge()
:
allo
w
passin
g
down m
a
rke
r
_size in x
m
p
a
ram_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
xdl_
m
erge():
introduce xmparam_t for merge specific
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
unio
C Ham
a
no
git_attr(): fix function signature
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
M
e
rge branch
'm
a
int'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio
C Hamano
Merge branch 'cc/re
s
et
-
more
'
commit
|
commitdiff
|
tree
2010-01-15
J
u
nio C Hamano
grep --no-index: allow use of "git
g
rep" outsi
d
e
a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-15
Junio C Hamano
g
r
ep:
p
re
p
are to
r
un out
s
ide of
a work tr
e
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Mer
g
e
branch 'jc/checkout-merg
e
-b
a
se'
commit
|
commitdiff
|
tree
2010-01-13
Junio C
H
aman
o
M
e
rge branc
h
'rs/maint-archive-match-pathspec'
commit
|
commitdiff
|
tree
2010-01-13
Junio C H
a
ma
n
o
M
e
rge branch 'il/vcs-help
e
r'
commit
|
commitdiff
|
tree
2010-01-13
Juni
o
C
H
amano
strbuf_addbuf(): allow passing
t
he same
b
u
f
to dst
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
J
u
nio C Hamano
M
erge
bran
c
h
'cc/reset-more'
commit
|
commitdiff
|
tree
2010-01-13
J
u
n
i
o
C Hamano
Me
r
ge branch 'nd/sparse'
commit
|
commitdiff
|
tree
2010-01-13
Junio C H
a
mano
t
7
502: test commi
t
.
s
tatus, --statu
s
and
--no-status
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
grep: ri
p
out pessimization to use
f
i
xmat
c
h()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio
C
Hamano
grep: rip out support f
o
r ex
t
ernal grep
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
Me
r
g
e branch 'mai
n
t'
commit
|
commitdiff
|
tree
next