summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2014-05-20rebase -i: test "Nothing to do" case with autostashLibravatar Matthieu Moy1-0/+15
2014-05-19rebase -i: handle "Nothing to do" case with autostashLibravatar Ramkumar Ramachandra2-3/+12
2013-07-29git-rebase: fix typoLibravatar Ralf Thielow1-1/+1
2013-06-13rebase: finish_rebase() in noop rebaseLibravatar Ramkumar Ramachandra2-0/+12
2013-06-13rebase: finish_rebase() in fast-forward rebaseLibravatar Ramkumar Ramachandra2-0/+12
2013-06-13rebase: guard against missing files in read_basic_state()Libravatar Ramkumar Ramachandra1-0/+2
2013-05-29rebase: implement --[no-]autostash and rebase.autostashLibravatar Ramkumar Ramachandra4-3/+208
2013-05-12rebase --merge: return control to caller, for housekeepingLibravatar Ramkumar Ramachandra1-3/+2
2013-05-12rebase -i: return control to caller, for housekeepingLibravatar Ramkumar Ramachandra1-4/+5
2013-05-12am: return control to caller, for housekeepingLibravatar Ramkumar Ramachandra2-6/+11
2013-05-12rebase: prepare to do generic housekeepingLibravatar Ramkumar Ramachandra1-0/+7
2013-05-12rebase -i: don't error out if $state_dir already existsLibravatar Ramkumar Ramachandra1-1/+1
2013-05-12am: tighten a conditional that checks for $dotestLibravatar Ramkumar Ramachandra1-1/+3
2013-05-03Git 1.8.3-rc1Libravatar Junio C Hamano1-1/+1
2013-05-03Merge branch 'tr/unpack-entry-use-after-free-fix'Libravatar Junio C Hamano1-1/+0
2013-05-03Sync with maintLibravatar Junio C Hamano2-3/+3
2013-05-03Merge branch 'tr/remote-tighten-commandline-parsing' into maintLibravatar Junio C Hamano3-3/+25
2013-05-03Merge branch 'jn/glossary-revision' into maintLibravatar Junio C Hamano1-3/+1
2013-05-03completion: zsh: don't override suffix on _detaultLibravatar Felipe Contreras1-1/+1
2013-05-02Documentation/git-commit: Typo under --editLibravatar Anders Granskogen Bjørnstad1-2/+2
2013-05-01Update draft release notes to 1.8.3Libravatar Junio C Hamano1-3/+16
2013-05-01Fix grammar in the 1.8.3 release notes.Libravatar Marc Branchaud1-78/+77
2013-05-01Merge branch 'hb/git-pm-tempfile'Libravatar Junio C Hamano1-1/+1
2013-05-01Merge branch 'rs/pp-user-info-without-extra-allocation'Libravatar Junio C Hamano1-35/+14
2013-05-01Merge branch 'tr/remote-tighten-commandline-parsing'Libravatar Junio C Hamano3-3/+25
2013-05-01Merge branch 'zk/prompt-rebase-step'Libravatar Junio C Hamano3-9/+31
2013-04-30unpack_entry: avoid freeing objects in base cacheLibravatar Thomas Rast1-1/+0
2013-04-29git-completion.bash: add remote.pushdefault to config listLibravatar Ramkumar Ramachandra1-0/+5
2013-04-29git-completion.bash: add branch.*.pushremote to config listLibravatar Ramkumar Ramachandra1-2/+2
2013-04-29Merge branch 'maint'Libravatar Junio C Hamano2-9/+136
2013-04-29Merge branch 'fc/zsh-completion' into maintLibravatar Junio C Hamano1-8/+126
2013-04-29complete: zsh: use zsh completion for the main cmdLibravatar Felipe Contreras1-1/+119
2013-04-29complete: zsh: trivial simplificationLibravatar Felipe Contreras1-8/+8
2013-04-29git-completion.bash: complete branch.*.rebase as booleanLibravatar Ramkumar Ramachandra1-0/+4
2013-04-29git-completion.bash: add diff.submodule to config listLibravatar Ramkumar Ramachandra1-0/+5
2013-04-29git-completion.bash: lexical sorting for diff.statGraphWidthLibravatar Ramkumar Ramachandra1-1/+1
2013-04-29Git.pm: call tempfile from File::Temp as a regular functionLibravatar H. Merijn Brand1-1/+1
2013-04-28Merge branch 'maint'Libravatar Junio C Hamano2-44/+6
2013-04-28documentation: trivial whitespace cleanupsLibravatar Felipe Contreras1-6/+6
2013-04-28t/Makefile: remove smoke test targetsLibravatar John Keeping1-38/+0
2013-04-28Merge branch 'nd/pretty-formats'Libravatar Junio C Hamano1-2/+2
2013-04-28pretty: Fix bug in truncation support for %>, %< and %><Libravatar Ramsay Jones1-2/+2
2013-04-28Merge branch 'jk/check-corrupt-objects-carefully'Libravatar Junio C Hamano1-1/+1
2013-04-28clone: Make the 'junk_mode' symbol a file staticLibravatar Ramsay Jones1-1/+1
2013-04-28Merge branch 'jk/merge-tree-added-identically'Libravatar Junio C Hamano2-1/+14
2013-04-28merge-tree: fix typo in "both changed identically"Libravatar John Keeping2-1/+14
2013-04-27completion: add missing format-patch optionsLibravatar Felipe Contreras1-1/+2
2013-04-26Git 1.8.3-rc0Libravatar Junio C Hamano2-19/+9
2013-04-26Merge branch 'rr/shortlog-doc'Libravatar Junio C Hamano5-22/+35
2013-04-26Merge branch 'th/bisect-skipped-log'Libravatar Junio C Hamano2-0/+30