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
Show a failure of rebase -p if the merge had a conflict
2008-12-03
Juni
o
C Hamano
M
e
r
ge
branch 'jk/ma
i
nt-commit-v-
s
tr
i
p'
into
m
a
int
commit
|
commitdiff
|
tree
2008-12-03
Davide
Libenzi
xdiff: g
i
ve up scanning si
m
i
l
ar
lines ea
r
ly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Juni
o
C H
a
m
ano
Merge branch 'bc/main
t
-ke
e
p-pack' into main
t
commit
|
commitdiff
|
tree
2008-12-03
J
u
nio C Hamano
Merge branch 'js/
m
ingw-
r
ename-fix
'
into maint
commit
|
commitdiff
|
tree
2008-12-03
J
aku
b
N
arebski
g
i
tweb: Fix handling
of non-ASCI
I
characters
i
n inserted
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
git-stash: use
g
it rev-
p
ars
e
-q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
J
u
nio C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2008-12-03
Johannes Sixt
t4030-diff-textconv: Mak
e
octal e
s
cape
s
e
quence more
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Scot
t
Chaco
n
Add
a built-in alias for 'stage'
t
o the 'a
d
d
' command
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-02
Linus T
o
rvalds
Add
b
a
c
k
sl
a
sh to list of
'crud' ch
a
r
acters in re
a
l
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-02
Junio C Hamano
M
a
kefile:
i
n
troduce
NO_P
T
HRE
A
DS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-02
Chr
i
sti
a
n Co
u
der
D
o
cumentation: describe
how to "bisect s
k
i
p
"
a range
.
.
.
commit
|
commitdiff
|
tree
2008-12-02
C
h
r
istian
Coud
e
r
bisect: fix "g
i
t bise
c
t
s
kip
<
commit>
"
and ad
d
tests
.
.
.
commit
|
commitdiff
|
tree
2008-12-02
Giuseppe
B
ilo
t
ta
Update
c
o
m
m
e
nt on
gitweb_c
h
eck/get
_
f
eatu
r
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-02
Junio C Hamano
Merge branch 'g
b
/gitweb-f
e
ature
'
commit
|
commitdiff
|
tree
2008-12-02
Ju
n
io C Hama
n
o
M
e
rge
g
i
t://repo
.
or
.
c
z
/git-gui
commit
|
commitdiff
|
tree
2008-12-02
Junio C Hamano
Me
r
g
e
g
i
t
://
g
it
.
kernel
.
or
g
/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2008-12-02
M
i
klos
Vajna
U
ser's M
a
nual:
r
e
mov
e
duplic
a
te
d
url at
the en
d
of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-01
J
u
nio C
Hamano
GIT
1
.
6
.
1-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-01
Junio C
Haman
o
Inc
l
u
d
e git-gui--askpass in git-gui
R
P
M
package
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-01
Junio C
Hamano
Mer
g
e
g
it://g
i
t
.
kernel
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2008-12-01
Junio
C Hamano
Merge git://repo
.
o
r
.
c
z
/git-
g
u
i
commit
|
commitdiff
|
tree
2008-12-01
Juni
o
C Hamano
send-email: do
not
reverse th
e
command line a
r
gum
e
n
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-01
Junio C
H
a
m
a
no
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2008-12-01
Junio C Ha
m
an
o
Update draft r
e
lease notes to 1
.
6
.
0
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-01
Junio C Ham
a
no
Merge branch 's
t
/maint-tag' into maint
commit
|
commitdiff
|
tree
2008-12-01
Juni
o
C Hamano
Merge branch '
m
k/maint-cg-
p
ush' into mai
n
t
commit
|
commitdiff
|
tree
2008-12-01
Nguyễn Thái
N
g
ọc Duy
gener
a
t
e
-cmdlist
.
sh: avoid sel
e
cti
n
g synopsis at wrong
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-01
Giu
s
eppe
Bilotta
gitweb: make gitwe
b
_check_f
e
ature
a
b
o
olea
n
wrapper
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-01
Junio C Hamano
g
i
tweb: rename
g
i
tweb_c
h
e
ck_feat
u
re to gitweb_get
_
fea
t
ure
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-01
Junio C
Ham
a
no
gitweb: fix
'
ct
a
g
s' fea
t
ure check and others
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-01
Junio C H
a
m
ano
git add --intent-to-add:
do not let an
e
m
p
t
y blob be
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-29
Ju
n
io
C
Hamano
git
add --intent-to-add
:
fix remov
a
l of cached
empt
i
n
ess
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-29
J
u
nio
C
H
a
mano
buil
t
in-rm
.
c:
e
x
p
lai
n
and c
l
a
r
i
f
y the "
l
o
c
al change
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-29
Junio C Hamano
Merge branch 'nd/
n
arrow'
(
early part) into jc/ad
d
-i
-
t-a
commit
|
commitdiff
|
tree
2008-11-28
Junio C Hamano
Merge
b
ranch 'cc/bise
c
t-
s
k
i
p'
commit
|
commitdiff
|
tree
2008-11-28
Junio C Hamano
Merge br
a
nch 'js/
m
i
n
g
w-ren
a
me-fix'
commit
|
commitdiff
|
tree
2008-11-28
Junio C Hamano
M
e
rge branch
'
st/le
v
enshtein'
commit
|
commitdiff
|
tree
2008-11-28
Junio C Ham
a
no
Merge branch 'cr/remo
t
e
-upda
t
e
-v'
commit
|
commitdiff
|
tree
2008-11-28
Junio C Hamano
Merge bra
n
ch 'rs/strbuf-expand'
commit
|
commitdiff
|
tree
2008-11-28
Junio C Haman
o
Me
r
ge branch
'mv
/
cl
o
ne-st
r
b
u
f'
commit
|
commitdiff
|
tree
2008-11-28
Ju
n
io C
H
amano
Me
r
g
e
branch
'lt/preload-lstat
'
commit
|
commitdiff
|
tree
2008-11-28
Junio C Hamano
Merge
branch 'ta/quiet-pul
l
'
commit
|
commitdiff
|
tree
2008-11-28
Juni
o
C Ham
a
no
Merge branch
'
p
h/
s
end-email
'
commit
|
commitdiff
|
tree
2008-11-28
Junio C
Hamano
Merg
e
branch
'
ma
i
n
t
'
commit
|
commitdiff
|
tree
2008-11-28
J
unio
C H
a
mano
M
erge bra
n
ch 'mv/fast-export' into
m
aint
commit
|
commitdiff
|
tree
2008-11-28
Sa
m
Vilain
sha1_file
.
c: resolve confusion EACCES vs EPERM
commit
|
commitdiff
|
tree
2008-11-28
J
oey Hes
s
sha1_file: a
v
oid b
o
gus
"
fi
l
e exists" error message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-28
Matt
McCu
t
chen
g
i
t
c
h
eck
o
ut: don't warn
a
bout unborn
branch if -f
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-28
SZEDE
R
Gábor
bash: offer refs ins
t
ead of filenam
e
s for 'git r
e
ver
t
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-28
SZ
E
DER Gábor
bash: comple
t
e full r
e
f
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-28
SZED
E
R Gábor
bash: remove dashed comman
d
leftovers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-27
Junio C H
a
mano
M
erge branch 'pw/m
a
int-p4' into maint
commit
|
commitdiff
|
tree
2008-11-27
Pete Wyckoff
git-p4:
f
i
x
keyw
o
r
d-expansi
o
n regex
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-27
Ralf
W
i
l
denhues
F
i
x
t
ypos i
n
the documentat
i
on
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-27
Junio C Hamano
M
e
rge branc
h
'
rw/
m
a
i
n
t
-typofix' into rw/typo
f
ix
commit
|
commitdiff
|
tree
2008-11-27
R
a
lf Wildenh
u
es
F
i
x
typos in
t
h
e do
c
u
men
t
atio
n
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-26
Junio C Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2008-11-26
Junio C
Hama
n
o
Merge branch 'mm/sort-config-doc'
commit
|
commitdiff
|
tree
2008-11-26
Junio
C
Hamano
Merge b
r
anc
h
'mm
/
mai
n
t
-sort-config-do
c
' into maint
commit
|
commitdiff
|
tree
2008-11-26
Junio C
Hamano
Merge b
r
anch 'm
m
/
maint-sort-
c
onfig-doc' i
n
to
mm
/
sort
.
.
.
commit
|
commitdiff
|
tree
2008-11-26
Matt McCutchen
config
.
txt:
a
l
phabetize config
u
rat
i
o
n sec
t
i
ons
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-26
Jim Meyering
x
diff-inte
r
face
.
c: rem
o
ve 10 duplicated
l
in
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-26
Ma
r
cel Koepp
e
n
t9
1
29-git-svn-i1
8
n-commitencoding:
M
ak
e
compare_svn_h
e
ad_wit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-26
Junio C Hamano
T
e
ach "
g
it diff" to honour --
[
no-]ext-
d
iff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-26
Trent
P
iep
h
o
s
e
n
d-email: Fix Pin
e
a
d
d
ress book
parsing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-26
Junio C Hamano
Merge bra
n
c
h 'for-ju
n
io'
of
git://source
.
winehq
.
o
r
g
.
.
.
commit
|
commitdiff
|
tree
2008-11-26
Christian Couder
bisect: teach
"
skip" t
o
accept special ar
g
u
m
ents like
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-25
Miklos
Vaj
n
a
bui
l
tin_clone: use strbuf i
n
cmd
_
clone()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-25
Miklos
Vajna
built
i
n-clo
n
e
:
use strbu
f
in clone_local
(
) and
copy_or_link_
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-25
M
i
k
los V
a
jna
builtin-clone:
u
se strb
u
f
in gues
s
_
d
i
r_name()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-24
Juni
o
C Hamano
M
e
r
g
e branch 'maint'
commit
|
commitdiff
|
tree
2008-11-24
R
ené Schar
f
e
r
e
move the unu
s
ed files interp
o
l
a
te
.
c
a
nd in
t
e
rpolate
.
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-24
René Sc
h
a
r
fe
daemon:
de
g
lob
a
lize
variab
l
e 'director
y
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-24
R
e
né
S
charfe
da
e
mon: inline fill
_
i
n
_ext
r
a_table_e
n
tries()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-24
René Sc
h
arfe
da
e
mon: us
e
strbu
f
_expand() instead of
interpolate()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-24
Ren
é
Scharfe
mer
g
e-recursive: use st
r
buf
_
expand() inst
e
ad of
i
n
terpolat
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-24
René Scharfe
add strbuf_expand_dict_cb(), a helper for s
i
m
pl
e
cases
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-24
Johann
e
s
Schindelin
fast-ex
p
ort:
u
se an uns
o
rted st
r
i
ng list for extra_refs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-24
Miklos Vajna
Add ne
w
testca
s
e to
sho
w
fast-export
d
o
e
s not alway
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-24
Joey
H
e
s
s
sha1_file: avoi
d
b
ogus "file exists" error
m
es
s
age
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-24
Bryan
D
rewery
Fix mis
l
eading
w
o
rding for git-cherry-pick
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-24
Alex Riese
n
Fix t4030-
d
iff-textconv
.
s
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-24
Alex
R
iesen
F
i
x han
d
le l
e
ak in sha1_file/unpac
k
_
o
b
jects if t
h
e
r
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-24
Joha
n
nes S
i
xt
compat/min
g
w
.
c: Teach mi
n
g
w_rename(
)
to replace read
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-24
Joh
a
nnes Sc
h
indelin
D
o
cumen
t
leve
n
shtein
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-24
Sa
m
uel Tard
i
eu
Fix deletion of last character in lev
e
n
shtein di
s
tance
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-19
Ma
r
k
Bur
t
on
g
i
t-commit
.
tx
t
- m
e
ntion that files
l
isted
on t
h
e c
o
mma
n
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-19
Tuncer Ayaz
Re
t
ain multiple -q/-v
o
c
currences in git pull
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-19
Mark
B
u
r
t
o
n
Docu
m
enta
t
ion: rev-list-options
.
tx
t
: added --branches
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-18
Miklos
Vajna
built
i
n-bra
n
ch: use str
b
uf
i
n rename_b
r
anch()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
b
u
i
l
tin-bra
n
ch: use s
t
rbuf in fill_t
r
acki
n
g_inf
o
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-18
Mik
l
os
Vajna
bu
i
l
tin-b
r
anch
:
use str
b
uf
in delete_branches()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-18
Cheng Renquan
gi
t
-remote: add verbose mod
e
to git remote u
p
date
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-17
Linus
T
orva
l
d
s
F
i
x index prelo
a
ding for racy
dirt
y
case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-17
Junio C Ha
m
a
no
Merge branc
h
'
maint'
commit
|
commitdiff
|
tree
2008-11-17
Christian Coude
r
Doc
u
ment
a
tion: tutorial
:
add inf
o
rm
a
tion about "git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-17
Chris
t
ian Co
u
der
Document
a
tion:
u
se
r
-manual: add information about
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-17
Junio
C Hamano
builtin-
r
emote
.
c: plug a sma
l
l memory l
e
ak in get
_
one_r
e
mote
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-17
Chen
g
Renquan
git-
r
em
o
te
:
match
u
sage st
r
ing with
t
he man
u
a
l pages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next