repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'mv/clonev'
2008-09-03
Junio
C
H
ama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-09-03
Junio
C
Hamano
S
tart 1
.
6
.
0
.
2 maintenanc
e
cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-03
Junio C
H
am
a
n
o
Merge branch 'nd/worktree' into maint
commit
|
commitdiff
|
tree
2008-09-03
Juni
o
C
Hamano
M
erge branch
'
h
o/
d
ashless' into
m
aint
commit
|
commitdiff
|
tree
2008-09-03
Junio C
H
aman
o
Merge branch 'tr/f
i
lter-branch'
commit
|
commitdiff
|
tree
2008-09-03
J
unio C H
a
mano
Merge branch 'np/maint-safer-
p
ack'
commit
|
commitdiff
|
tree
2008-09-03
Juni
o
C Hamano
Merge branch 'r
f
/
man-env'
commit
|
commitdiff
|
tree
2008-09-03
J
unio
C Hamano
Merge branch 'jc/author-ni
c
k
name
'
commit
|
commitdiff
|
tree
2008-09-03
Junio C
Hamano
Merge
branc
h
'
d
p
/
pid-uintmax'
commit
|
commitdiff
|
tree
2008-09-03
J
unio
C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-09-03
Juni
o
C H
a
mano
Merge
b
ran
c
h
'np/m
a
in
t
-
safer-pack' i
n
to
n
p/pack
commit
|
commitdiff
|
tree
2008-09-01
J
unio C
Hamano
g
i
t
-
merge d
o
cumentat
i
on: describe how co
n
flict is presented
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-01
Junio
C
Hamano
checkout --c
o
nfli
c
t=<style>:
rec
r
e
a
te merge in a n
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-01
J
u
nio C Hamano
Merge
b
ranch '
t
r/rev-li
s
t-docs' into tr/
f
ilter-branch
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
Mer
g
e branch 'maint
'
commit
|
commitdiff
|
tree
2008-08-31
Junio C Haman
o
g
it-add --intent-
t
o
-
add (-N
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
J
unio C Hamano
'git foo' program ide
n
ti
f
ies itse
l
f without
d
ash in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Jun
i
o
C
H
amano
git commit --author=$nam
e
: look $nam
e
up in e
x
isting
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
diff: v
a
ry default pre
f
ix depending on what are com
p
a
red
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
J
u
n
io C Hama
n
o
diff: Help "le
s
s" hide ^M from the output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C
H
amano
Me
r
ge b
r
anch
'
maint'
commit
|
commitdiff
|
tree
2008-08-31
Junio C Haman
o
gitattributes
:
-crlf
i
s
not
binary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
J
unio C Haman
o
che
c
kout
-
m: recreate merge
w
hen c
h
ecking out of
u
nmerged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
Mer
g
e
branch 'jc/maint-checkout-fix' into 'jc
/
better
.
.
.
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
git-mer
g
e-recursive:
l
e
a
rn t
o
hono
r
merge
.
conflictstyle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Ham
a
no
merge
.
conflicts
t
yle: cho
o
se bet
w
een
"
m
erg
e
" and "diff
3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
J
u
n
i
o C Hama
n
o
rerere: u
n
derstand "diff3 -m"
s
t
yle conflicts w
i
th
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio
C
Hamano
rerer
e
.
c:
use symbolic c
o
nstants t
o
keep tr
a
ck o
f
parsing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Haman
o
xmerge
.
c: "diff3 -m" sty
l
e clip
s
me
r
g
e reduc
t
ion l
e
vel
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C
Ham
a
no
xme
r
g
e
.
c: minim
u
m readability fixups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Ju
n
io C Hama
n
o
xdiff-mer
g
e:
o
p
t
ionally
s
h
o
w conflic
t
s in
"
diff3 -m
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C
Hamano
xdl_fi
l
l
_merg
e
_bu
f
fer(): s
e
p
arate out a too de
e
p
ly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
checkout
--ours/--theirs: allow check
i
ng
o
ut one side
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
J
unio
C
Hamano
checkout -f: allow
i
gnoring unmerged paths when checking
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Ju
n
io C
H
amano
check
o
ut: do not check out unmerged higher
s
t
ages r
a
n
d
om
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
J
u
nio
C Hamano
Merge
b
ran
c
h 'jc/p
o
st-simplif
y
'
(early par
t
) i
n
to tr
.
.
.
commit
|
commitdiff
|
tree
2008-08-30
J
u
nio C Hamano
g
it-apply: Loos
e
n "match_beginning" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
Fix
e
xam
p
le in g
i
t-name-rev do
c
u
m
e
ntation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
Merge bra
n
c
h
'sp
/
missing-thin
-
base' i
n
to maint
commit
|
commitdiff
|
tree
2008-08-30
Junio C Haman
o
Merge branch 's
b
/daemon'
commit
|
commitdiff
|
tree
2008-08-30
Junio C H
a
mano
Merge branch '
a
f/maint-instal
l
-
no-
h
an
d
lin
k
' in
t
o maint
commit
|
commitdiff
|
tree
2008-08-30
Ju
n
i
o
C Hamano
shell
:
do
not play duplicated definiti
o
n games to shrink
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio
C Hamano
Merge
b
r
a
nch 'np/verif
y
-p
a
ck' int
o
m
a
i
n
t
commit
|
commitdiff
|
tree
2008-08-29
Junio C Hama
n
o
Merge branch '
m
a
i
nt'
commit
|
commitdiff
|
tree
2008-08-28
Junio C Hamano
Merge branch 'mv/merge-custom'
commit
|
commitdiff
|
tree
2008-08-28
Junio C Hamano
M
erge b
r
anch 'ml/s
u
bmodule'
commit
|
commitdiff
|
tree
2008-08-27
J
u
n
io C Hamano
Merge b
r
a
n
ch 'am/che
r
ry-pick-re
r
ere'
commit
|
commitdiff
|
tree
2008-08-27
Jun
i
o C Ha
m
ano
Merge branch '
j
c/add-a
d
dremove'
commit
|
commitdiff
|
tree
2008-08-27
J
u
nio C Hamano
Merge
b
ranch 'np/ver
i
fy-pa
c
k
'
commit
|
commitdiff
|
tree
2008-08-27
Ju
n
io C Haman
o
Merge
b
ranch 'da/
s
ubmo
d
ule-syn
c
'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2008-08-27
Junio
C
Hamano
ctype
.
c: protect
t
iny C prep
r
oc
e
ssor const
a
nts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Junio
C
Hamano
Merge bran
c
h 'af/m
a
i
nt-install-no-ha
n
dlink'
commit
|
commitdiff
|
tree
2008-08-27
Ju
n
i
o
C Ha
m
a
no
Merge br
a
nch
'
j
c/no-slim-shell'
commit
|
commitdiff
|
tree
2008-08-27
J
unio C Ha
m
ano
Merge bra
n
c
h '
m
aint'
commit
|
commitdiff
|
tree
2008-08-26
J
u
nio C Hamano
daemon
.
c: minor s
t
yle fixup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>:
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
J
unio C H
a
mano
Rever
t
"Bui
l
d-in "git-shell""
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hama
n
o
Merge bran
c
h
'
jc/no-s
l
im-sh
e
ll
'
commit
|
commitdiff
|
tree
2008-08-24
Ju
n
io C Hamano
M
e
rge br
a
nch 'maint' to sync with 1
.
6
.
0
.
1
commit
|
commitdiff
|
tree
2008-08-24
J
u
n
i
o C Hamano
GIT 1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Ha
m
ano
M
e
rge
b
ranch 'ag/maint-co
m
bine-d
i
ff-
f
i
x
' into maint
commit
|
commitdiff
|
tree
2008-08-24
Junio C
H
a
mano
Merge branch 'mv/maint-merge-f
i
x' into ma
i
nt
commit
|
commitdiff
|
tree
2008-08-24
J
uni
o
C Haman
o
t7606: fix custom merge test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio
C
Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2008-08-24
Junio C Haman
o
merge: fix
numerus bugs around "trivial merge" area
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
J
u
n
io C Hamano
unpack
_
t
rees(): protect the hand
c
rafted
in-core index
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Junio C
Hamano
discard_cache: res
e
t lazy name_h
a
s
h
b
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Junio C Hamano
templates/Mak
e
file: inst
a
ll is unnecessary, just use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Jun
i
o
C
Haman
o
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C H
a
m
ano
Mer
g
e br
a
nch 'ml/submodule-fo
r
each'
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C
Hamano
Me
r
ge branch
'pm/log-exit-code'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge branch '
s
b
/commit
-
tree-minileak'
commit
|
commitdiff
|
tree
2008-08-21
Ju
n
i
o
C Hamano
Merg
e
branch 'pb/refl
o
g-dwim
'
commit
|
commitdiff
|
tree
2008-08-21
J
u
nio
C
Hamano
Merge branch 'jc/a
d
d-st
o
p-a
t
-symlink'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
M
erge branch
'
kh/di
f
f-tree'
commit
|
commitdiff
|
tree
2008-08-21
J
u
nio C Hamano
Merg
e
branch 'mg/
c
ount-ob
j
ects'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Haman
o
Merge branch 'mz
/
push-verbose'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Mer
g
e br
a
nch 'jc/i
n
dex-exte
n
d
ed-flags'
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C Hamano
Me
r
ge branch 'cc
/
merge-ba
s
e
-
many'
commit
|
commitdiff
|
tree
2008-08-21
Jun
i
o C H
a
m
ano
Mer
g
e b
r
anch 'jc/test-deeper'
commit
|
commitdiff
|
tree
2008-08-21
J
u
nio C Hamano
M
erge branch 'js/pa
r
a
llel-
t
est'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
F
i
x
"git-me
r
ge -s bogo" help text
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
J
unio C Hamano
Up
d
a
t
e
d
r
aft
release n
o
tes for 1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C
Hamano
Merg
e
b
ranch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-08-20
Jun
i
o
C
Ham
a
no
U
p
d
a
te draft
release
n
ote
s
for 1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hama
n
o
"git-m
e
r
ge": allow fast
-
forwardi
n
g in a stat-dirty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C
H
a
mano
completion: find ou
t
s
u
p
p
orted
merge st
r
ategi
e
s correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
for
-
e
a
ch-re
f
: cope wi
t
h
t
ags
w
ith
incomp
l
e
t
e li
n
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
diff --chec
k
: do not get co
n
fus
e
d by
n
ew blank lines
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Build-
i
n "git-shell
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Merge branc
h
'
bd/d
i
ff-strbu
f
'
commit
|
commitdiff
|
tree
2008-08-20
J
u
n
i
o C Hamano
Merge branc
h
'dp/hash-literally
'
commit
|
commitdiff
|
tree
2008-08-20
Jun
i
o C Hamano
Merge branch '
j
s/c
h
e
ckout-d
w
im-lo
c
a
l
'
commit
|
commitdiff
|
tree
2008-08-20
Junio
C
Hamano
Merge
bran
c
h
'ph/enable-thre
a
ded'
commit
|
commitdiff
|
tree
2008-08-20
J
u
n
i
o
C Ham
a
no
Merge branch 'jk/page
r
-
s
wap'
commit
|
commitdiff
|
tree
2008-08-20
Junio
C Hamano
Merge branch
'rs/imap
'
commit
|
commitdiff
|
tree
2008-08-20
Ju
n
io C
Ham
a
no
Mer
g
e bra
n
ch 'js/m
i
ngw-stat'
commit
|
commitdiff
|
tree
2008-08-20
Junio
C Hamano
shell
:
do not pl
a
y duplica
t
e
d def
i
nitio
n
ga
m
es
t
o
shrink
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
Junio C H
a
mano
M
erge branch
'
maint'
commit
|
commitdiff
|
tree
2008-08-19
Junio C Hamano
compat: in
t
roduce o
n
_disk
_
by
t
e
s
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next