repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge: give a bit prettier merge message to "merge branch~$n"
2006-12-16
Junio
C Hamano
mer
g
e:
g
ive a
bit pr
e
ttier merge message to
"merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
J
u
nio C Ha
m
ano
Merge branch
'
js/
s
how'
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hama
n
o
g
i
t-reset [-
-
mixed] <tr
e
e> [--] <paths>
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio
C
Hamano
git
-
r
e
set: make it work from w
i
t
h
in a subdir
e
c
t
ory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Jun
i
o C
Hamano
gi
t
-fetch
:
m
a
ke it work from
with
i
n a s
u
bd
i
re
c
tory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-14
Junio C
Ham
a
n
o
Update
g
it-diff d
o
cum
e
ntation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
J
u
nio C Ha
m
ano
Me
r
ge
b
r
anc
h
'jc/diff--cached'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
git-
s
v
n
:
a
llo
w
bo
t
h diff
.
co
l
or and color
.
dif
f
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C
Hamano
config documentation: group colo
r
i
tems together
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
uni
o
C Hamano
Merge bran
c
h 'jc/read-tree-ignore'
commit
|
commitdiff
|
tree
2006-12-13
J
u
n
io
C Hamano
Merge branch 'ew/rerer
e
'
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio
C Hamano
M
erge bra
n
ch 'n
p
/addc
o
mmit'
commit
|
commitdiff
|
tree
2006-12-13
Junio
C
Hamano
Merge
b
r
a
n
ch 'lh/bra
n
c
h-rename'
commit
|
commitdiff
|
tree
2006-12-13
J
u
n
io C
Hamano
Merge branch 'jc/comm
i
t-careful'
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C Hamano
Merge br
a
nc
h
'a
p
/clon
e
-origin
'
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C Haman
o
Merge
branch 'jc/nu
m
stat'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
amano
Mer
g
e branch 'rr/cv
s
exportcommit'
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C Hamano
Merge b
r
anch 'ap/
b
ra
n
ch
'
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio
C
Hamano
branch --
c
olor: ch
a
n
g
e
d
efault col
o
r selection
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge branch
'js/merge'
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C Haman
o
send-pa
c
k:
t
ighten che
c
ks
f
o
r
remote names
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
uni
o
C
Hamano
g
it-push: accept tag <ta
g
> as advert
i
sed
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
a
m
ano
spuriou
s
.
s
p
in manpag
e
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C Hamano
git merge:
rew
o
r
d failure mes
s
age
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Haman
o
Rever
t
"git-dif
f
:
I
ntroduce --index a
n
d deprecate
.
.
.
commit
|
commitdiff
|
tree
2006-12-13
J
u
ni
o
C Ham
a
no
Merge branch
'main
t
'
commit
|
commitdiff
|
tree
2006-12-13
Junio
C
H
am
a
n
o
g
i
t-push: document removal of remote r
e
f with :<d
s
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C
H
am
a
no
Merg
e
b
r
a
n
ch
'master' into j
s
/merge
commit
|
commitdiff
|
tree
2006-12-13
J
unio C Ham
a
n
o
M
e
rge branch 'maint
'
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C Hamano
add test case for recu
r
sive merg
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C
H
amano
diff --numstat: show binary wit
h
'-'
to match "apply
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C
Hamano
s
h
o
r
tlo
g
: f
i
x segfault o
n
empty auth
o
r
n
ame
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
J
u
n
io C Hamano
s
h
or
t
log: remov
e
"
[
P
ATCH]" prefix fr
o
m shortlog output
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Jun
i
o C Hamano
M
er
g
e
bra
n
c
h
'm
a
int'
commit
|
commitdiff
|
tree
2006-12-10
Ju
n
io C Hamano
git-commit: allow --onl
y
to
l
o
s
e what was st
a
ged
e
arli
e
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-10
Ju
n
io C Hamano
Documentation/git-commit:
rewrite to
m
ake
it
m
ore
e
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
Junio C Hamano
git
-
rerere: add
'
gc'
command
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
Junio
C
Hama
n
o
Fix perl/ bui
l
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-07
Junio C Hamano
Mer
g
e branch 'main
t
'
commit
|
commitdiff
|
tree
2006-12-06
J
u
n
io C Ham
a
no
g
i
t
-merge: fix "fix confusion between tag and
b
ranch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio
C
H
ama
n
o
git-merge
:
squelch needless error
message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
Merge
commit
|
commitdiff
|
tree
2006-12-06
Jun
i
o C Haman
o
Merge br
a
n
c
h 'maint'
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
git-rese
t
to remove "$GIT
_
D
IR/MERGE_MSG"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
J
u
nio C
H
am
a
n
o
re
a
d-t
r
ee:
d
ocument --
e
xclu
d
e-per-directory
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C
H
amano
Lo
o
sen "working
f
ile
wil
l
be
lost" c
h
eck
i
n Porcela
i
n-ish
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Juni
o
C Ha
m
ano
read
-
tree: further
loos
e
n "workin
g
file
will be lost
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-05
J
unio C Hamano
Mer
g
e
b
ranc
h
'maint'
commit
|
commitdiff
|
tree
2006-12-04
Junio C H
a
mano
unpack-tre
e
s
:
make sur
e
"d
f
_conflict
_
entry
.
name"
is
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
J
u
ni
o
C Hamano
rec
e
ive-pack:
d
o not in
s
i
st on fa
s
t-forward outside
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Junio C Hamano
mer
g
e-recursive:
u
s
e xdl_m
e
rge()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Junio C Ha
m
ano
xmerge: make return value f
r
om xdl_mer
g
e() m
o
re us
a
ble
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Junio C Hamano
Me
r
ge branc
h
'm
a
i
n
t
'
commit
|
commitdiff
|
tree
2006-12-03
Junio
C Hamano
git-merge: fix con
f
usion betwe
e
n
tag and branch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Junio
C
Hamano
Merge master
.
ke
r
nel
.
org:/pu
b
/scm/gitk/gitk
commit
|
commitdiff
|
tree
2006-11-29
Juni
o
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-11-29
J
u
nio C Hamano
tutoria
l
: talk about user
.
name ear
l
y and don't start
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
J
unio C H
a
ma
n
o
M
e
r
g
e
bran
c
h
'jc/gl
o
bf
e
t
c
h'
commit
|
commitdiff
|
tree
2006-11-29
J
u
nio C Hamano
M
e
rge br
a
n
c
h
'maint'
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hama
n
o
git b
l
ame -C: fix output for
m
a
t
tweaks when crossing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Junio C
Hamano
c
v
s
import: style
f
ixup
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Junio C Ha
m
ano
Merge branch 'js/shortlog'
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
Merge branch 'jc/push-del
e
te-ref'
commit
|
commitdiff
|
tree
2006-11-27
Junio C
H
amano
Me
r
ge branch
'j
c
/me
r
ge'
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
git-
m
erge: do
n
ot
l
e
a
k rev
-
parse output
used for checking
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Ju
n
io C
H
a
m
an
o
g
i
t-merge: tigh
t
en
e
rror c
h
ecking
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Jun
i
o
C
H
a
m
ano
Merge branch 'jc
/
pack-peeled'
commit
|
commitdiff
|
tree
2006-11-26
Junio
C
Haman
o
g
r
ep: do not s
k
ip
u
nmerged entries when greppin
g
in
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-26
Ju
n
io
C
Hamano
M
e
rge branch
'
jn/web'
commit
|
commitdiff
|
tree
2006-11-25
J
unio C Ham
a
no
fetch-pack: do
not barf when duplicate re pattern
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
J
u
n
i
o C H
a
mano
git-
f
etc
h
: allow forcing gl
o
b pattern in
r
ef
s
p
e
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Hamano
M
e
r
ge branch 'master
'
in
t
o jc/globfetch
commit
|
commitdiff
|
tree
2006-11-25
Junio C Haman
o
git-fetch: exit with non
-
zer
o
st
a
t
us when
fast-forward
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Ju
n
io C H
a
m
a
no
git
-
commit: sh
o
w --s
u
mmar
y
af
t
er successful commi
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Ham
a
no
git
-
shortlog:
make
c
ommon repository prefix configura
b
le
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Ju
n
io C Haman
o
g
i
t-shor
t
l
o
g: fix common repository prefix
a
bbreviation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Hamano
g
i
t
-branch
-D: make it work e
v
e
n
when on a yet-to-be
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Hama
n
o
git-clone: stop dumb p
r
otocol fro
m
copying refs outside
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
gitweb: (style) use chomp without parentheses consistently
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
J
u
nio C Hamano
Allow git
p
ush
t
o
delete remo
t
e
r
ef
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Ha
m
ano
Merge branch 'jn/
w
eb
'
commit
|
commitdiff
|
tree
2006-11-24
Junio
C
Hamano
Merge
branch '
p
b/diffro
o
t
'
commit
|
commitdiff
|
tree
2006-11-24
Junio C
Hamano
Merge branch 'jc/pa
c
k-heuri
s
ti
c
s
'
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
Merg
e
b
r
anch
'
jc/numstat'
commit
|
commitdiff
|
tree
2006-11-24
Junio C
H
amano
Merge bran
c
h
'
ap/b
r
anch-ref-display'
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
Merge branch 'ap/prune
'
commit
|
commitdiff
|
tree
2006-11-24
Junio C Ham
a
no
Ty
p
ef
i
x builtin-prune
.
c::prune_ob
j
ect()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
Merge bra
n
ch 'jc/upload
-
p
ack'
commit
|
commitdiff
|
tree
2006-11-24
Juni
o
C Hamano
refs outside refs/{
h
eads,
t
ags} match le
s
s str
o
ngly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio
C Hamano
git-f
e
tc
h
:
all
o
w
glob patt
e
rn in refspec
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
g
i
t-fetch: f
i
x dumb protocol transport to fetch from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
gi
t
-fetch: reus
e
ls-
r
emote res
u
l
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-23
Junio C Hamano
GIT 1
.
4
.
4
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-23
J
u
n
i
o C
H
amano
t
rust-execut
a
ble-b
i
t
:
fix break
a
ge for symlinks
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-22
Junio C H
a
m
ano
St
o
re peeled refs in packed-refs (take 2)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-22
J
u
nio C Hamano
merg
e
:
allow me
r
gi
n
g into a yet-to-be-born bran
c
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-22
Junio C Hama
n
o
git-merge:
m
ake i
t
usable as the first class UI
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-22
Junio C Haman
o
remove merge-recursive-old
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-20
Junio C Hamano
Store peeled r
e
f
s in packed
-
refs fi
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next