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
rebase: use @{upstream} if no upstream specified
2011-02-10
Martin von Zweigbergk
rebase: use
@{upstream}
i
f no u
p
stream speci
f
i
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zw
e
igbergk
rebase -i: remo
v
e
unnec
e
s
s
ary
s
tate
r
eb
a
s
e
-root
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweigbergk
rebas
e
-
i
: do
n
't
read unused variable pre
s
erve_merges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigbergk
git-re
b
ase--a
m
:
r
emove u
n
nece
s
s
ary --3way option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zwei
g
bergk
rebase -m: d
o
n'
t
prin
t
exit
c
o
de 2
when mer
g
e
fails
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbergk
rebase -m: remember allow_r
e
rere_autoupda
t
e option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in
von Zweigbergk
reb
a
se: remembe
r
str
a
tegy a
n
d st
r
ate
g
y o
p
t
i
o
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Z
w
eigbergk
r
ebase: remembe
r
v
e
rbose option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
artin vo
n
Zweig
b
e
rgk
rebase: extract code f
o
r writing basic sta
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n Zweigbergk
reba
s
e
:
f
act
o
r out sub comma
n
d handling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: m
a
ke
-
v a
ti
n
y
bit more verbose
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase -i:
align variable
n
a
m
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigbergk
reb
a
se: show
c
onsistent
c
o
nf
l
i
ct resol
u
tio
n
h
i
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbe
r
gk
rebase: ext
r
act a
m
code to new
source
f
ile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
ergk
r
ebase: ext
r
act me
r
ge
c
ode to new so
u
rce
f
ile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweig
b
ergk
rebase: r
e
move $b
r
anch as synonym for
$o
r
ig
_
head
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
i
n von Zweigbergk
re
b
ase -i: su
p
port --stat
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
e
base:
f
actor
out
call to p
r
e-rebase hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Z
w
eigbergk
r
e
base:
factor out clean
w
o
r
k t
r
ee check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von
Z
w
e
igbergk
rebase:
f
act
o
r out reference parsing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigberg
k
reba
s
e: reorder vali
d
ation st
e
ps
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Z
w
eigb
e
rgk
r
e
base -i: remove now unnecessary
direct
o
ry che
c
k
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigbergk
reba
s
e: factor out c
o
mmand l
i
ne
o
ption process
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbe
r
gk
r
ebase: al
i
gn variable con
t
ent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
t
i
n
v
on Z
w
eigbergk
rebase
:
alig
n
v
a
riab
l
e na
m
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von
Z
weigbergk
rebase:
s
tric
t
er
check of standalone
sub command
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
artin v
o
n
Zweigbergk
rebase: act o
n
command line o
u
tside
par
s
in
g
lo
o
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweigbergk
reba
s
e
:
improve detectio
n
of
r
e
bas
e
in progress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
re
b
ase: re
m
ove
unused rebase state 'pre
v
_head'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
er
g
k
r
eb
a
se: read state out
s
i
d
e loop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in v
o
n Zweigbe
r
gk
rebase: re
f
a
ctor r
e
a
d
ing of state
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbergk
rebase: clearer na
m
es for
d
ire
c
t
o
ry variables
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
J
u
n
i
o C Hamano
M
erge branc
h
'tr/me
r
g
e-unbor
n
-clo
b
ber'
commit
|
commitdiff
|
tree
2011-02-10
J
u
nio C Ham
a
n
o
Merge branch 'jc/unpack-trees'
commit
|
commitdiff
|
tree
2011-02-10
Junio
C
Hamano
Merge branch
'jc/
f
sck-fixes'
commit
|
commitdiff
|
tree
2011-02-10
Jun
i
o C Hamano
Mer
g
e branc
h
'tr/diff-words-
t
est'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Haman
o
Merge b
r
anch 'rr/fi-import-marks-if-
e
x
ists'
commit
|
commitdiff
|
tree
2011-02-10
J
u
n
io C Hamano
Merge branch
'
j
n/u
n
pack-lstat-failure-r
e
port'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hama
n
o
Merge b
r
anch
'e
f
/
al
i
as-v
i
a-r
u
n-comma
n
d'
commit
|
commitdiff
|
tree
2011-02-10
J
unio
C Hamano
Merge b
r
anch 'cb
/
se
t
up'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hamano
Merge branch 'ae/be
t
t
er-t
e
mplat
e
-failu
r
e-report'
commit
|
commitdiff
|
tree
2011-02-10
Juni
o
C
Hamano
M
e
rge branc
h
'jn/cherry
-
p
i
c
k-strat
e
g
y-optio
n
'
commit
|
commitdiff
|
tree
2011-02-10
Jun
i
o C Hamano
Merg
e
branch 'main
t
-1
.
7
.
0
'
i
n
to maint
commit
|
commitdiff
|
tree
2011-02-10
J
o
nathan
N
iede
r
fa
s
t-import: introduce
"feature notes
"
command
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Jonathan Ni
e
der
fas
t
-i
m
po
r
t: clarify
docume
n
tat
i
on of "
f
ea
t
ure"
c
o
m
mand
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-09
U
w
e Kl
e
ine-König
Do
c
umentat
i
o
n/merge subtree How-T
o
:
fix typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Jens L
e
hmann
pull: Document t
h
e "--[n
o
-]r
e
curse-submod
u
les
"
options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Jona
t
han
N
ie
d
er
quot
e
.
h: si
m
p
l
ify
the incl
u
si
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Nguy
ễ
n Thái Ngọc Duy
sha
1
_o
b
je
c
t_info: exam
i
ne ca
c
hed_object stor
e
too
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Ng
u
y
ễ
n
T
hái Ngọc Duy
sha1_file
.
c:
m
ov
e
find
_
cached_object up so sha1
_
object_
i
nfo
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Nguyễn Thái N
g
ọc Duy
Add const to parse
_
{commit,tag}_buffer()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Nguyễn T
h
ái
N
gọc Duy
diff:
s
u
p
port --cached on unborn branches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Jak
u
b
Narebski
gitweb: M
e
n
t
ion option
a
l P
e
rl
m
odules in INSTALL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Sit
a
ra
m
C
ham
a
rty
p
ost
-
receive-email:
s
uppress e
r
ror if d
e
scription file
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
P
at Thoyt
s
t7407: fix line e
n
dings for mingw build
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Jo
h
annes Si
x
t
t4120-apply-po
p
t
:
help sys
t
ems with core
.
filemode=fa
l
se
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Pat Th
o
yt
s
t
3
509
:
us
e
unconstra
i
ned in
i
tial test to setup
r
epository
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Joh
a
nnes Sixt
start_
c
ommand: flush
buff
e
rs
i
n the WIN32 code pat
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Shawn O
.
P
earce
bundle: Use OFS_D
E
L
TA
in bundle files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-31
Junio C Hama
n
o
Merge branch 'jl/fetch-submodule-recursi
v
e
' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2011-01-31
J
en
s
L
e
h
m
ann
t552
6
: Fix wrong argumen
t
order in "git config"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-31
Junio C Hamano
G
i
t 1
.
7
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
J
unio C H
a
mano
f
s
ck:
do not give up too early in fsck_di
r
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
J
unio C Hama
n
o
fsck: drop unused p
a
rame
t
er
from t
r
a
verse
_
one_object(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Adam
T
kac
Don't pass "--xht
m
l" to hight
l
ight
in g
i
tweb
.
p
erl
script
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Junio C Hamano
M
e
rge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2011-01-27
Jonathan Nieder
reb
a
s
e -i: cl
a
rify in
-
ed
i
tor documentati
o
n
of "exec"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Jeff Ki
n
g
tests: s
a
n
i
tiz
e
more git env
i
r
o
nment variables
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Jun
i
o
C Hamano
Merge b
r
an
c
h 'jn/fast-import-emp
t
y-tree-removal' into
.
.
.
commit
|
commitdiff
|
tree
2011-01-27
Jonathan Nie
d
er
fast
-
impo
r
t: treat filem
o
d
ify with empty tree as dele
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Je
f
f King
r
e
base:
g
ive a better error
m
essage for bo
g
us branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
J
e
f
f Kin
g
reb
a
se:
use explicit "
-
-" with
checkout
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-24
Ju
n
i
o
C Haman
o
Git
1
.
7
.
4-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-24
Jun
i
o C Hamano
Merge branch
'
as/use
r
di
f
f-pascal'
commit
|
commitdiff
|
tree
2011-01-24
Junio C Hamano
Merge
branch 'jn/
s
e
t
up-fixes'
commit
|
commitdiff
|
tree
2011-01-24
J
ona
t
han Nieder
t15
1
0: fix typo in the
c
om
m
ent
o
f a tes
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-24
Ju
n
io C
H
a
mano
Docu
m
entation
updates for
'
G
IT_
W
O
RK_TREE wi
t
hout GIT_DIR
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-21
Jonathan Nieder
Subje
c
t: setup: offi
c
ially
s
upport --work-tre
e
without
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-21
Jo
n
athan
N
ieder
Do
c
umentati
o
n
:
do not treat reset --keep as a s
p
e
c
ial
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-20
B
j
örn
Steinbrink
Correctly re
p
ort corrupted object
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Jonathan Niede
r
tests:
c
ompres
s
t
he setup t
e
s
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
J
onathan Niede
r
tests
:
c
osmetic i
m
p
r
ove
m
en
t
s to the
repo-setup test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
M
erge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2011-01-19
Erik F
a
ye-Lund
e
x
e
c
_
cmd: rem
o
ve
unus
e
d extern
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Ju
n
io C Hamano
Merge branch
'
jn/gitweb-no-logo
'
into main
t
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hama
n
o
M
erg
e
branch
'
jk/diff-driver-b
i
nary-doc'
i
n
to maint
commit
|
commitdiff
|
tree
2011-01-19
Jun
i
o
C Ha
m
ano
Merge br
a
nch 'tr/submodule
-
relative-scp-url'
into maint
commit
|
commitdiff
|
tree
2011-01-19
J
u
nio C Hamano
Merge branch 'rj/maint-difft
o
ol
-
cygwin-w
o
rk
a
round'
.
.
.
commit
|
commitdiff
|
tree
2011-01-19
Junio C H
a
mano
Merge bra
n
c
h 'rj/maint-test-fixes' into main
t
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Me
r
ge branc
h
'jn/m
a
i
n
t
-gitweb-pa
t
h
i
n
fo-fi
x
' in
t
o maint
commit
|
commitdiff
|
tree
2011-01-19
J
u
n
i
o C Hamano
M
e
r
ge bran
c
h
'ak/descri
b
e-exa
c
t
' i
n
to
m
ai
n
t
commit
|
commitdiff
|
tree
2011-01-19
Ju
n
io C Hamano
Merge br
a
nch 'jn
/
m
a
int-fast-import-obj
e
ct-reuse' into
.
.
.
commit
|
commitdiff
|
tree
2011-01-19
Junio C
Hamano
Merge
b
r
anch '
j
n/submodule
-
b
-curr
e
nt' into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Me
r
ge branch 'jc/ma
i
nt-svn-info-test-fix'
into maint
commit
|
commitdiff
|
tree
2011-01-19
Juni
o
C Hamano
Merge
branc
h
'nd/maint-rela
t
ive' into ma
i
nt
commit
|
commitdiff
|
tree
2011-01-19
Jo
n
at
h
an Nied
e
r
Documentation/
f
ast-import: put explanat
i
o
n of
M 04000
0
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Ra
m
say Jones
svnd
u
mp
.
c: Fix a printf format compiler warni
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Jonathan N
i
eder
remot
e
-ext
:
do not s
e
gfault f
o
r blank line
s
Noticed-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
J
on
a
than Nieder
Documentat
i
on/
f
ast-import:
c
apitali
z
e b
e
g
inning of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Junio C
Hamano
t4034 (diff --word-diff): add a mi
n
imum Perl drier
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next