repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Support a merge with conflicting gitlink change
2007-12-11
Junio C Hamano
Support a merge with conflict
i
ng gi
t
link chan
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-10
J
unio C Hamano
Update draft
Re
l
ease
Notes fo
r
1
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-09
J
unio C H
a
ma
n
o
R
e-fix ls-remote
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-09
Ju
n
io C Hamano
Merge bra
n
ch
'
jc/s
p
h
t
'
commit
|
commitdiff
|
tree
2007-12-09
Juni
o
C
Ha
m
ano
M
erge br
a
nch 'pr/mergetool
'
commit
|
commitdiff
|
tree
2007-12-09
J
u
nio
C
Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2007-12-09
J
u
nio C
H
amano
Re-fix "builtin-commit: fix --si
g
n
off"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-09
Juni
o
C
H
a
mano
F
i
x c
o
m
mit-msg hook to allow edi
t
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-09
Junio C Hamano
ls
-
remote: resurrect pat
t
ern limit support
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-08
Junio C Hamano
s
h
ortlog: code restructuring and
c
l
ean-u
p
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-08
Junio C Hama
n
o
mailmap: fix bogus for() loop
tha
t
happened
t
o be safe
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-08
J
unio C Hamano
g
i
t-bisect visu
a
l
iz
e
: work in non-wi
n
dowed environ
m
ents
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-07
Junio C Ham
a
no
Update draft release notes to 1
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-07
Junio
C Hamano
M
e
r
ge
br
a
nc
h
'ma
s
ter' o
f
g
it://
r
e
p
o
.
o
r
.
c
z/git-gui
commit
|
commitdiff
|
tree
2007-12-07
J
unio
C
H
ama
n
o
Merge branch
'mw/
c
vsserv
e
r
'
commit
|
commitdiff
|
tree
2007-12-07
Junio
C
Hamano
M
erge
b
ra
n
ch 'kh/fetch-optparse'
commit
|
commitdiff
|
tree
2007-12-07
J
uni
o
C
H
a
m
an
o
Merge bra
n
ch 'jc
/
git
-
log-d
o
c'
commit
|
commitdiff
|
tree
2007-12-07
Junio C Hamano
Merge b
r
anch 'j
c
/a
d
di-color'
commit
|
commitdiff
|
tree
2007-12-07
Junio C Hamano
Merge bra
n
ch 'jc/do
c
m
ake-perl'
commit
|
commitdiff
|
tree
2007-12-07
Junio C Hamano
Mer
g
e
b
r
anch 'jc/clean-fix'
commit
|
commitdiff
|
tree
2007-12-07
Junio C Haman
o
Merge
branch 'main
t
'
commit
|
commitdiff
|
tree
2007-12-06
J
u
nio C Hama
n
o
git-status documentation: mention
s
ub
d
ir
e
ctor
y
behaviour
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-06
Junio C
H
a
mano
do not discard st
a
tus
in
f
etc
h
_
r
e
f
s_v
i
a_pack()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-06
Junio C Hamano
hg-to-git: handle an empt
y
dir in h
g
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-06
Junio
C
Ha
m
ano
Use
g
itat
t
ributes
to define p
e
r
-
p
a
th whitespace rul
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-06
Junio C Hamano
co
n
fi
g
--g
e
t-col
o
rbool: diff
.
color is a
d
ep
r
e
c
at
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-06
Junio C Hamano
git-
c
lean: Honor pathspec
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-06
Junio C
Hamano
Color support for
"
g
i
t
-add -i"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-06
J
u
nio C
H
amano
git config
--get-colorb
o
ol
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-06
Ju
n
io
C
Ham
a
no
Documenta
t
ion
:
c
o
lor
.
*
= tr
u
e means "auto"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-06
J
u
nio C Hamano
Merge
b
ra
n
ch '
m
aint'
commit
|
commitdiff
|
tree
2007-12-06
Juni
o
C H
a
mano
git-a
m
-i: rep
o
rt
r
ewritten title
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-06
Junio
C
Hamano
gi
t
grep sho
w
s the sam
e
hit repeatedly for
unmer
g
ed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-05
Junio
C
Hamano
Me
r
ge
b
r
a
nc
h
'nd/maint-wor
k
-tr
e
e-fix'
into maint
commit
|
commitdiff
|
tree
2007-12-05
Ju
n
io C Hamano
Revert "
g
i
t-am: catc
h
m
issing author
date ea
r
ly
.
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-05
J
unio C Hamano
g
i
t-cvs
s
erv
e
r runs
h
ooks/po
s
t-update
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-05
Ju
n
i
o
C Hamano
t5510:
ad
d
a bit more te
s
ts
f
or fetch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-05
Juni
o
C
Ha
m
ano
Merge
branch '
w
c/ad
d
-
i'
commit
|
commitdiff
|
tree
2007-12-05
Ju
n
io
C Hamano
Merg
e
branch
'k
h
/com
m
it'
commit
|
commitdiff
|
tree
2007-12-05
Junio C Hamano
Merge
b
ranch '
s
p/
r
efspe
c
-match'
commit
|
commitdiff
|
tree
2007-12-04
Junio C Hamano
Documenta
t
ion/git
.
txt:
t
ypofi
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-04
Junio
C Hamano
Documenta
t
i
o
n: rerere is enabled by default these days
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-04
J
u
nio C Hamano
F
o
rmatting fix for Documentatio
n
/git
-
help
.
txt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-04
J
u
n
io C Hamano
Run the sp
e
cified per
l
in Documentation/
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-04
J
u
nio C Hamano
Update draft
release
notes for 1
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-04
Junio C Haman
o
Add git-fast-
e
x
p
ort to list of
com
m
a
n
ds
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-03
Junio C Hamano
git-commit documentat
i
on: fix u
n
fini
s
hed sent
e
n
ce
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-03
J
unio C Hamano
g
it-commit -
-
a
llo
w
-empty
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-03
Junio
C Hamano
git-commit
-
-allow-empty
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-03
Junio C Hamano
git-commit:
A
llow to
amen
d
a merge
c
ommit that does
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-03
Junio C Hama
n
o
Fix --sign
o
ff in builtin-com
m
it differently
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-03
Jun
i
o C H
a
m
ano
Me
r
ge branch
'
js/prune-expire'
commit
|
commitdiff
|
tree
2007-12-03
J
u
n
io C Hamano
Mer
g
e branch 'js/export-with-assig
n
m
e
nt'
commit
|
commitdiff
|
tree
2007-12-03
Junio C Hamano
Me
r
g
e branch 'js/fast-expo
r
t'
commit
|
commitdiff
|
tree
2007-12-03
Junio C Ham
a
no
Merge branch 'js/rebase-i-rere
r
e'
commit
|
commitdiff
|
tree
2007-12-03
Juni
o
C Hamano
Merge branch 'js
/
pull-rebase'
commit
|
commitdiff
|
tree
2007-12-03
Juni
o
C Hamano
Merge branch 'wc
/
rebase-insn'
commit
|
commitdiff
|
tree
2007-12-03
Junio C Hamano
Merge bra
n
ch
'jc/typebreak'
commit
|
commitdiff
|
tree
2007-12-03
Junio C Ha
m
ano
Merge branch
'
jc/co
l
or'
commit
|
commitdiff
|
tree
2007-12-03
Junio
C Ham
a
no
Me
r
ge br
a
n
ch 'dc/gitweb'
commit
|
commitdiff
|
tree
2007-12-02
Jun
i
o C Hamano
git-am: catch missing auth
o
r date
early
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-02
Ju
n
io C Hamano
Merg
e
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-12-02
Junio C
H
amano
rename: Break filep
a
irs with di
f
ferent ty
p
es
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-02
Junio
C
Hamano
Update draf
t
release note
s
for 1
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-02
Junio
C Hamano
Conso
l
idate co
m
mand lis
t
t
o one
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-02
Junio C Hamano
R
esu
r
r
ect pe
e
k-re
m
ote
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-02
J
uni
o
C Hamano
Mer
g
e
b
r
anch 'tt/
h
elp'
commit
|
commitdiff
|
tree
2007-12-01
J
unio C Hamano
Mer
g
e
b
ranch 'jc/mo
v
e-g
i
tk'
commit
|
commitdiff
|
tree
2007-12-01
Junio C Hamano
Merge branch 'jc/branch-conta
i
ns'
commit
|
commitdiff
|
tree
2007-12-01
Junio C Hamano
Merge b
r
anch 'cr/tag-opti
o
n
s'
commit
|
commitdiff
|
tree
2007-12-01
Juni
o
C
H
amano
Update
draft relea
s
e
no
t
e
s
for 1
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-01
Juni
o
C Hamano
M
e
rg
e
1
.
5
.
3
.
7 in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-01
Ju
n
io C Hamano
GIT 1
.
5
.
3
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-01
Junio C Hama
n
o
Fix typo in t4008 test title
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-12-01
Junio
C Ha
m
ano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-11-30
Junio
C Hamano
Merge branc
h
'jk/m
a
i
n
t
-cvsimport-fix' into maint
commit
|
commitdiff
|
tree
2007-11-29
Junio
C Hamano
per-dire
c
to
r
y-exclud
e
: lazily read
.
giti
g
no
r
e files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-11-29
Juni
o
C H
a
ma
n
o
dir
.
c:
m
inor c
l
ean-up
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-11-29
Junio C Hamano
git
-
config -
-
get-color: get
c
onfigured color
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-11-29
Junio C Ham
a
no
"color
.
diff =
t
rue"
i
s not "
a
lways" a
n
ymore
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-11-29
Junio
C
Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2007-11-29
Junio C Hamano
scrip
t
s: do not get confus
e
d
with
H
EAD in wo
r
k tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-11-26
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-11-26
J
u
nio C Ha
m
ano
Merge
b
ranch 'mai
n
t' of git://
l
inux-nfs
.
o
r
g/~bfi
e
l
d
s
.
.
.
commit
|
commitdiff
|
tree
2007-11-25
Junio C Hamano
revert/cherry-pi
c
k
: do not
m
e
n
ti
o
n the origina
l
r
ef
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-11-25
Junio
C
H
a
mano
"git-ta
g
-s"
should crea
t
e
a
s
igne
d
annotated tag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-11-25
Junio C
Haman
o
g
i
t-check
o
ut: de
s
cribe detached h
e
ad correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-11-25
J
unio C Hamano
add
-
i: Fix running from a s
u
bdirectory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-11-25
Junio C Hamano
builtin-add: fix c
o
mm
a
nd line bu
i
lding to
c
al
l
in
t
e
ractive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-11-25
Junio C Hamano
Merge b
r
anch 'kh/commit' into wc/add-i
commit
|
commitdiff
|
tree
2007-11-25
J
u
nio C
H
a
m
ano
Updat
e
d
r
a
ft releas
e
notes for 1
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-11-25
J
unio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-11-25
Junio C
Hamano
Merge
b
ranch 'rv/main
t
-ind
e
x
-commit'
i
nto maint
commit
|
commitdiff
|
tree
2007-11-25
Junio C Hamano
Merge branch
'lt
/
m
a
int
-
rev-list-gitlin
k
'
into
main
t
commit
|
commitdiff
|
tree
2007-11-25
J
unio
C
Hamano
Merge bran
c
h
'
j
c
/main
t
-add-sync-st
a
t' into maint
commit
|
commitdiff
|
tree
2007-11-25
Jun
i
o C Ha
m
ano
M
e
rge
b
ranch 'jc/maint
-
format-patch-encodin
g
' into
.
.
.
commit
|
commitdiff
|
tree
2007-11-25
Junio C
H
a
mano
Merge branch
'bs
/
m
a
int-t7005'
into maint
commit
|
commitdiff
|
tree
2007-11-25
Ju
n
io
C Hamano
M
erge bran
c
h 'bs/ma
i
n
t-commit-options' into maint
commit
|
commitdiff
|
tree
2007-11-25
Junio C Hamano
Deprecate p
e
ek-remote
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-11-25
Ju
n
io C Hamano
core
.
whit
e
spa
c
e: documen
t
a
tion updates
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next