repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'gb/refactor-pathinfo'
2008-09-03
J
unio C Ha
m
ano
Merge bran
c
h
'
nd/work
t
ree
'
into maint
commit
|
commitdiff
|
tree
2008-09-03
Junio C Hamano
Merge bra
n
ch 'ho/dashless
'
into maint
commit
|
commitdiff
|
tree
2008-09-03
J
unio C Ha
m
ano
M
erge branch '
t
r/filter-br
a
nch'
commit
|
commitdiff
|
tree
2008-09-03
Jun
i
o C Hama
n
o
Mer
g
e branch 'np/m
a
int-safer-
p
ack'
commit
|
commitdiff
|
tree
2008-09-03
Junio C Hamano
Merge branch
'
rf/man-env'
commit
|
commitdiff
|
tree
2008-09-03
Junio
C
H
amano
Mer
g
e branch 'jc
/
a
uth
o
r-n
i
ckname'
commit
|
commitdiff
|
tree
2008-09-03
Junio C Hamano
Me
r
ge b
r
anch '
d
p
/
pid-uintmax
'
commit
|
commitdiff
|
tree
2008-09-03
Juni
o
C Hamano
Merge
branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2008-09-03
Junio C
H
am
a
no
Merge
branch 'np/maint
-
safer-pack' into np/pac
k
commit
|
commitdiff
|
tree
2008-09-01
Junio C Hama
n
o
git-merge documentation
:
des
c
rib
e
how confli
c
t i
s
pr
e
sented
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-01
J
u
nio C Hamano
checkout --conflict=<style>: recreate me
r
ge i
n
a non
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-01
J
unio C Hamano
Merge branch 'tr/rev-list-docs' into tr/filter-branch
commit
|
commitdiff
|
tree
2008-08-31
J
u
nio C Hama
n
o
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
gi
t
-add --intent-to-add
(
-
N)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Haman
o
'
git
f
o
o
' program identifie
s
itsel
f
without
dash in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Juni
o
C Haman
o
git
commit
-
-
author=$name: lo
o
k $n
a
me
u
p
in e
x
isting
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Juni
o
C Hamano
diff: vary
d
efaul
t
prefix depending on what
are c
o
mpared
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Junio
C
Ham
a
no
diff: Help "less"
hide ^M fro
m
the output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hama
n
o
Merge b
r
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-08-31
J
u
n
io C H
a
m
a
no
gitattribut
e
s: -crlf is
n
ot bin
a
ry
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Ju
n
i
o C
H
a
mano
checkout -m: re
c
reate m
e
rge w
h
en checki
n
g out of unme
r
ge
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Junio C
H
amano
Merge branch 'jc/ma
i
nt
-
c
heck
o
ut-fix' into
'jc/better
.
.
.
commit
|
commitdiff
|
tree
2008-08-31
Junio C Ha
m
ano
git-merge-rec
u
rsive: l
e
arn to honor merge
.
conflictstyle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Junio
C
Hamano
merge
.
conflictstyl
e
: choose between "me
r
ge" and
"diff
3
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Jun
i
o C H
a
mano
r
erere: und
e
rs
t
and "diff3 -m" style c
o
nfl
i
cts with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Jun
i
o C Ham
a
n
o
rerere
.
c: use symbolic
c
on
s
tants to keep track of parsin
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Juni
o
C Hamano
xmerg
e
.
c:
"
diff3
-m" style cl
i
ps
merge reducti
o
n
l
e
vel
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Jun
i
o C Hamano
xmerge
.
c: minimum
readability
f
ixups
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
xdiff-merge:
o
ptiona
l
ly show conflicts in "diff3
-m
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
xdl
_
f
i
l
l_merge_buffe
r
():
s
eparate o
u
t a
t
oo deeply
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Ha
m
a
n
o
chec
k
out --our
s
/--theirs:
a
l
low che
c
kin
g
out one side
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
checkout -f: allow ignoring u
n
merged paths when checking
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Ham
a
no
checko
u
t: do not
check ou
t
unm
e
rged higher stages random
l
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Ha
m
ano
M
e
r
ge branc
h
'jc/post
-
simplify' (early
p
ar
t
)
i
nto
tr
.
.
.
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
git-apply: Lo
o
s
e
n
"ma
t
ch_beginning" l
o
g
ic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Ha
m
ano
Fix exa
m
p
le
i
n git-n
a
me-re
v
documentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
Merge branch 's
p
/
m
i
ssing-t
h
in-ba
s
e
' into
maint
commit
|
commitdiff
|
tree
2008-08-30
Junio C Haman
o
Merge br
a
nch
'sb
/
d
a
emon'
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hama
n
o
Merge branc
h
'a
f
/maint-install
-
no-h
a
n
dl
i
nk' into
m
a
i
nt
commit
|
commitdiff
|
tree
2008-08-30
Junio C
H
amano
shell: do n
o
t play du
p
l
i
cated de
f
inition games to shrink
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
Merge branch
'
np/verify-p
a
ck' into maint
commit
|
commitdiff
|
tree
2008-08-29
J
u
n
io C Hamano
Mer
g
e b
r
anc
h
'maint
'
commit
|
commitdiff
|
tree
2008-08-28
Junio C Hamano
Merge branch 'mv/m
e
rg
e
-custom'
commit
|
commitdiff
|
tree
2008-08-28
Ju
n
io C
Hamano
M
e
rge b
r
anch 'ml/submodule'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merg
e
bra
n
c
h 'am
/
cherry-pick-
r
erere'
commit
|
commitdiff
|
tree
2008-08-27
Jun
i
o
C Ha
m
a
no
Merge
br
a
nch
'jc/add-addrem
o
ve'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge branch
'np/verify-p
a
ck'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge branch 'da/submodule-sy
n
c
'
commit
|
commitdiff
|
tree
2008-08-27
Junio C
Hamano
M
e
rge branch
'ma
i
nt
'
commit
|
commitdiff
|
tree
2008-08-27
J
u
nio C
H
amano
cty
p
e
.
c: p
r
o
t
ect ti
n
y C pre
p
rocessor constan
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-27
Junio C H
a
ma
n
o
Me
r
ge branch 'af/
m
ain
t
-
i
nstall-no-handli
n
k
'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge branch
'jc/
n
o-
s
lim-shell'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hama
n
o
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2008-08-26
Junio C
H
ama
n
o
da
e
mon
.
c
:
minor style f
i
xup
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>:
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Ju
n
io
C
H
ama
n
o
R
evert "Buil
d
-
in "git-shell""
commit
|
commitdiff
|
tree
2008-08-24
Ju
n
io C Hamano
Merge branch 'jc/no-s
l
im-shell'
commit
|
commitdiff
|
tree
2008-08-24
Jun
i
o C Haman
o
Merge
b
ran
c
h
'
maint
'
to sync with 1
.
6
.
0
.
1
commit
|
commitdiff
|
tree
2008-08-24
Jun
i
o
C Hamano
G
IT
1
.
6
.
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
J
unio C Hamano
Merge bra
n
ch
'ag/m
a
int-combine-diff-fix'
i
n
t
o
m
a
i
n
t
commit
|
commitdiff
|
tree
2008-08-24
Junio C
H
ama
n
o
Merg
e
branch '
m
v/m
a
int-merge-fix' in
t
o
maint
commit
|
commitdiff
|
tree
2008-08-24
Junio
C Ham
a
no
t7606: fix custom merge te
s
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
Merg
e
b
r
a
n
c
h 'main
t
'
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
mer
g
e
:
fix numeru
s
b
u
gs around "trivial me
r
ge" area
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
J
unio C Ha
m
ano
u
n
p
ac
k
_trees(): pr
o
tect the handcrafted i
n
-core inde
x
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
Junio C H
a
m
ano
discard
_
cache: reset
lazy name_hash bit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Junio C Hamano
templa
t
e
s/Makefile: install
i
s
un
n
ecessary,
j
ust use
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
Junio C Ha
m
an
o
Merge
b
ranch 'main
t
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge
bra
n
c
h 'ml/submodule-foreach'
commit
|
commitdiff
|
tree
2008-08-21
Junio C
H
ama
n
o
Merge bran
c
h '
p
m/log-exit-cod
e
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Haman
o
Merge
b
ran
c
h 'sb/commit-tree-mi
n
ile
a
k'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hama
n
o
Me
r
ge bran
c
h
'pb/reflog-dwim
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C
H
amano
Me
r
ge branch 'j
c
/add-
s
t
op-at-syml
i
nk'
commit
|
commitdiff
|
tree
2008-08-21
J
u
nio C Hamano
Merge b
r
anch 'kh/diff
-
tr
e
e'
commit
|
commitdiff
|
tree
2008-08-21
J
unio C Ha
m
ano
Merge branc
h
'mg
/
count-objects'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hama
n
o
M
e
rge b
r
anch
'
m
z
/pus
h
-verbose'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
M
e
rge
b
ran
c
h 'jc/ind
e
x
-extended-fla
g
s
'
commit
|
commitdiff
|
tree
2008-08-21
J
unio C Ham
a
no
Merge br
a
nch
'cc/merge-base-many'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Me
r
g
e
bran
c
h
'
j
c/test-deeper'
commit
|
commitdiff
|
tree
2008-08-21
J
u
ni
o
C Ha
m
ano
Merge
b
r
a
n
ch 'js/p
a
rallel
-
test
'
commit
|
commitdiff
|
tree
2008-08-21
J
unio C Hamano
Fi
x
"gi
t
-merge -s bogo
"
help t
e
xt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Juni
o
C H
a
mano
Upd
a
te draft r
e
leas
e
n
ote
s
for 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
J
u
nio C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-20
Ju
n
io C Hamano
Up
d
a
te draft
r
e
l
e
ase notes for 1
.
6
.
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Junio C
Hamano
"git-merge
"
: allow fast-forwa
r
ding i
n
a
s
t
at-dirty
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
completion: find out supp
o
r
t
ed me
r
g
e strat
e
gies correctl
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
for-eac
h
-ref:
cope
w
ith tags wi
t
h
in
c
omplete lines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Junio C
H
amano
diff
-
-
check: do
not
get
confused by new bl
a
nk lines
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Build-in "
g
it
-
shell"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Jun
i
o
C
Hama
n
o
Merge branch 'bd/diff-
s
trbuf'
commit
|
commitdiff
|
tree
2008-08-20
J
unio C Ham
a
n
o
Merge branch
'dp/hash-lit
e
rally'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Ham
a
no
M
erge br
a
nch
'
js/checkout-dwim-local'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Merge branch '
p
h/e
n
able-th
r
eaded
'
commit
|
commitdiff
|
tree
2008-08-20
Jun
i
o C Haman
o
Merge bra
n
ch 'jk/pager-swap'
commit
|
commitdiff
|
tree
2008-08-20
Jun
i
o C Hamano
Merge b
r
anch 'rs/imap'
commit
|
commitdiff
|
tree
2008-08-20
Jun
i
o C Ha
m
ano
M
erge branch 'js/m
i
ngw-stat'
commit
|
commitdiff
|
tree
2008-08-20
J
u
n
i
o C Hamano
shell: do not play d
u
plicate
d
definiti
o
n games to shrink
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-19
Junio
C Haman
o
Me
r
ge branch 'm
a
int'
commit
|
commitdiff
|
tree
2008-08-19
Junio C Hama
n
o
compat
:
introduce on_disk_bytes()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-18
Junio C Hamano
revisio
n
-
-
simplify-merges: make it a no-op w
i
tho
u
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-18
Junio
C
Hamano
revisi
o
n --sim
p
l
ify-me
r
ges: do n
o
t leav
e
commits unprocessed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next