repo.or.cz
/
git
/
mingw
/
4msysgit.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
rebase: define options in OPTIONS_SPEC
2011-03-05
Martin von Zweigberg
k
rebase: def
i
n
e options in OPTIONS_SPEC
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-25
Mar
t
in von
Z
w
eigbergk
M
akefile: do
not i
n
stall sourced rebase scripts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigbergk
reba
s
e
:
use @{upstream}
if
n
o
u
p
stream
s
pec
i
fied
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
artin
v
on
Z
weigbergk
r
e
base -i: remo
v
e
unnecessary state reba
s
e-root
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigbe
r
gk
rebase -i:
d
o
n
'
t
re
a
d
unuse
d
variab
l
e
preserve_merges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbergk
g
it-r
e
base--am:
r
e
m
ove u
n
neces
s
ary --3
w
ay option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Z
w
e
i
gbergk
rebase -
m
: d
o
n't p
r
in
t
exit code 2 when me
r
g
e f
a
ils
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin vo
n
Zweigbergk
rebase
-m: remembe
r
allow_rerere_autoupdate optio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin v
o
n
Zweigbergk
rebase: remember strategy and strategy o
p
tions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweig
b
e
r
gk
r
e
base: remember verbose opt
i
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Z
w
eigbergk
rebase: extract
code for writing
b
a
s
ic state
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigbe
r
gk
reb
a
se: fac
t
o
r
out sub command
han
d
li
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n
Z
weigbe
r
gk
reba
s
e: make -v a tiny
bit more verbose
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbe
r
gk
reb
a
s
e
-
i: align variabl
e
names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
t
in von Zweigbergk
rebase
:
show consistent conflict resolution h
i
nt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
igbergk
r
e
b
ase: extract
am code to ne
w
s
o
ur
c
e
f
ile
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweigbergk
rebase: extract
m
erge
code to new source
file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
artin vo
n
Zweigbergk
rebase: remov
e
$
b
ranch as synon
y
m for $orig
_
head
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zw
e
i
gberg
k
rebase -i:
support
-
-stat
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in
vo
n
Zweigbergk
reb
a
se:
f
a
c
tor out
c
a
l
l to pre-re
b
ase hook
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Z
w
eigbergk
rebase: factor
out cle
a
n
work tr
e
e ch
e
ck
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zwei
g
bergk
rebase: factor out reference p
a
rsing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
a
rt
i
n
von Z
w
eigbergk
r
eb
a
se
:
reorder
v
alid
a
tion
s
t
ep
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
artin
v
on Zweigbergk
rebase -i: r
e
m
o
ve now u
n
necessary directory checks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Z
w
eigb
e
rgk
reba
s
e: factor out command
line
option pro
c
essing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
re
b
ase:
a
l
i
gn variable
c
onte
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigbe
r
gk
rebase: align variab
l
e name
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
ar
t
in vo
n
Zweigbergk
rebase: stricter check of sta
n
dalone sub c
o
mmand
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zw
e
igbergk
rebase: act on
c
omman
d
l
i
ne outsi
d
e parsing loop
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase:
i
mprov
e
detection of rebase i
n
pr
o
gress
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbergk
r
eba
s
e: remove unused reb
a
s
e
state
'prev_head'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in
v
on
Z
weigbergk
rebase: read s
t
ate o
u
tside loo
p
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigbe
r
gk
rebas
e
:
r
e
facto
r
r
e
a
ding of
st
a
te
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
artin vo
n
Zweigbergk
rebase: cl
e
a
rer
names for
directory variab
l
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Junio C
H
amano
Merge branch 'tr/merge-unborn-clobb
e
r'
commit
|
commitdiff
|
tree
2011-02-10
Jun
i
o C Hamano
Merge
branch 'jc/un
p
ac
k
-trees'
commit
|
commitdiff
|
tree
2011-02-10
Junio
C
Hamano
Merge
b
ranch 'jc
/
fsck-fix
e
s'
commit
|
commitdiff
|
tree
2011-02-10
J
uni
o
C
Hamano
Merge branch 'tr/diff
-
words-test'
commit
|
commitdiff
|
tree
2011-02-10
J
u
nio C Hamano
Merg
e
b
ranch 'rr/fi-imp
o
rt-marks-
i
f-exists
'
commit
|
commitdiff
|
tree
2011-02-10
J
unio
C
Ha
m
ano
Mer
g
e branc
h
'jn/u
n
pack-
l
s
t
a
t-
f
ailure-report'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Haman
o
Merge branch '
e
f/al
i
a
s
-via-run-command'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Ha
m
a
n
o
Merge branch 'cb/s
e
tup'
commit
|
commitdiff
|
tree
2011-02-10
J
uni
o
C
Hamano
Merge
branch 'ae/better-template-fail
u
re
-
repo
r
t'
commit
|
commitdiff
|
tree
2011-02-10
J
u
n
i
o C Hama
n
o
M
e
rge br
a
n
c
h 'jn
/
c
herry-p
i
ck-strategy-option'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Ham
a
no
Me
r
ge b
r
anch 'maint-1
.
7
.
0' into mai
n
t
commit
|
commitdiff
|
tree
2011-02-10
Jonathan Ni
e
der
fas
t
-import: introduce "feature notes" command
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Jonat
h
an Niede
r
f
ast-import: clarif
y
documenta
t
ion of
"
f
e
a
t
ure" c
o
mma
n
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-09
Uw
e
Kleine-König
D
ocumentati
o
n/merge
subt
r
e
e
Ho
w
-
T
o: fix ty
p
o
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Jens Lehmann
p
ull: Document the "--[no
-
]r
e
c
urse-submodu
l
es" o
p
tions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Jonathan Nieder
quote
.
h
:
s
implify the in
c
lu
s
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Ngu
y
ễn Thái Ngọc Duy
sha1_obje
c
t_info: examine cached_obj
e
ct
st
o
re too
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Nguyễn T
h
ái
N
gọc Duy
sha1_
f
ile
.
c: move
find_cached_o
b
ject up so
sh
a
1_object_i
n
fo
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Nguyễn Thái Ngọc
Du
y
A
d
d
c
o
n
st to parse_{commit,tag}_
b
uffer(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Nguyễn Thái Ngọc
Duy
diff: supp
o
rt
-
-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
Jakub Narebski
gitweb: Mention
o
p
tional Perl mo
d
ules in I
N
STA
L
L
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Sita
r
am Chama
r
ty
p
ost-receive-email: sup
p
ress er
r
or if des
c
ription file
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Pat T
h
oy
t
s
t7407:
fix
line endings for mingw bui
l
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Joha
n
n
e
s
S
i
xt
t
4
120-appl
y
-popt: help systems
with core
.
fil
e
mode=false
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Pat
T
h
o
yts
t
3
509:
us
e
u
nconst
r
a
in
e
d initial test to set
u
p repo
s
i
t
ory
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Johannes Sixt
start
_
com
m
and: f
l
u
sh buffers in the WIN32
c
ode p
a
th
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Shawn O
.
Pearce
bu
n
dle: Use
O
F
S_
D
ELTA i
n
bund
l
e files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-31
Junio C Hamano
M
e
rge branch 'jl/fe
t
ch-submodu
l
e-recurs
i
v
e' into maint
commit
|
commitdiff
|
tree
2011-01-31
Jens
Le
h
mann
t552
6
:
F
ix wrong argu
m
ent order in "git
config"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-31
Junio
C
H
amano
Git 1
.
7
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
Jun
i
o C
Haman
o
fsck: d
o
not gi
v
e up
t
o
o early in fsck
_
dir()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
Junio C Hamano
f
sck: drop
u
nused paramete
r
from tr
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
"
--xhtml" to hightlight in gi
t
web
.
perl scr
i
pt
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
Ju
n
io C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-01-27
J
o
nathan Nieder
rebase -i: clarify in-editor document
a
tio
n
of "exec"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
t
e
st
s
: sanitize more git
e
nviron
m
en
t
vari
a
bles
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
Junio
C
Hamano
M
erge branch '
j
n/
f
ast
-
import
-
empty-tree-removal
'
int
o
.
.
.
commit
|
commitdiff
|
tree
2011-01-27
Jonathan
Nieder
fast-imp
o
rt: treat filemodify with empty t
r
ee as del
e
t
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
Je
f
f King
rebase:
g
i
v
e
a
bett
e
r err
o
r mes
s
age
for bogus branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
J
eff King
rebase: u
s
e explicit
"--" with c
h
eckout
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-24
Junio C
H
amano
Git 1
.
7
.
4-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-24
Junio C Hamano
Merg
e
branch 'as/userdif
f
-pascal'
commit
|
commitdiff
|
tree
2011-01-24
Jun
i
o C
H
amano
Merge b
r
anch 'jn/s
e
tup-fixes'
commit
|
commitdiff
|
tree
2011-01-24
J
onathan
Nieder
t1510: fix ty
p
o in the comment of a test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-24
Junio C Hamano
Documentation updates for 'GIT_WORK_TREE wit
h
out GIT_DIR
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-21
Jonathan Nieder
Subject
:
setup: officially
su
p
port --work
-
tre
e
witho
u
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-21
Jon
a
t
h
an Nieder
Document
a
tion: do
n
ot
treat
reset --ke
e
p
as a special
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-20
Björn
S
teinbrink
Correctly r
e
port cor
r
u
pted objects
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-19
Jonathan Nieder
te
s
ts
:
compress the
setup tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-19
Jonathan Ni
e
der
te
s
ts: cosmet
i
c improvements to the repo-setup test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-19
Jun
i
o C
Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2011-01-19
Erik Faye-Lund
e
x
ec_cmd: rem
o
v
e
unused exter
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-19
Junio
C Hamano
Merge branch 'jn/gi
t
web-no-logo' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2011-01-19
Junio C Ha
m
ano
Merge branch 'j
k
/diff
-
driver-binary-do
c
' into main
t
commit
|
commitdiff
|
tree
2011-01-19
Jun
i
o C
H
amano
M
e
r
ge
b
ranch 'tr/submo
d
ule-relative-
s
cp-url' into
m
ain
t
commit
|
commitdiff
|
tree
2011-01-19
Junio C Ha
m
a
no
M
erge branch 'rj/maint
-
d
ifftoo
l
-cy
g
win-wo
r
kar
o
u
n
d'
.
.
.
commit
|
commitdiff
|
tree
2011-01-19
Jun
i
o
C
Hamano
Merge br
a
n
c
h
'
r
j/maint-test-fixes' into main
t
commit
|
commitdiff
|
tree
2011-01-19
J
u
nio C
H
amano
Merge branch 'jn/mai
n
t-
g
itweb-pathinfo-fix' in
t
o
ma
i
nt
commit
|
commitdiff
|
tree
2011-01-19
Junio C H
a
m
a
no
Merge branch 'ak/describe-ex
a
c
t' int
o
maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C Ham
a
no
Merge branch 'jn/maint-fast-import-object-re
u
se' into
.
.
.
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Mer
g
e branch 'jn/submodule-b-current' into maint
commit
|
commitdiff
|
tree
2011-01-19
Ju
n
io C
H
amano
Mer
g
e b
r
anch '
j
c/maint-sv
n
-info-t
e
st-fix'
into maint
commit
|
commitdiff
|
tree
2011-01-19
J
unio C Hamano
Me
r
ge
branch
'
nd/maint-relative'
i
nto maint
commit
|
commitdiff
|
tree
2011-01-19
J
onatha
n
Nieder
Docu
m
entation/fast-
i
mport: put e
x
planation of
M
0
4
0
0
00
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-19
Rams
a
y Jo
n
es
svndump
.
c: Fix a printf f
o
rmat
com
p
i
ler war
n
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-18
Jonathan Nieder
remote-
e
xt
:
d
o
not segfault
fo
r
blank
lines
Noticed-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next