summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* git-rebase: fix typorr/rebase-autostashRalf Thielow2013-07-291-1/+1
* rebase: finish_rebase() in noop rebaseRamkumar Ramachandra2013-06-132-0/+12
* rebase: finish_rebase() in fast-forward rebaseRamkumar Ramachandra2013-06-132-0/+12
* rebase: guard against missing files in read_basic_state()Ramkumar Ramachandra2013-06-131-0/+2
* rebase: implement --[no-]autostash and rebase.autostashRamkumar Ramachandra2013-05-294-3/+208
* rebase --merge: return control to caller, for housekeepingRamkumar Ramachandra2013-05-121-3/+2
* rebase -i: return control to caller, for housekeepingRamkumar Ramachandra2013-05-121-4/+5
* am: return control to caller, for housekeepingRamkumar Ramachandra2013-05-122-6/+11
* rebase: prepare to do generic housekeepingRamkumar Ramachandra2013-05-121-0/+7
* rebase -i: don't error out if $state_dir already existsRamkumar Ramachandra2013-05-121-1/+1
* am: tighten a conditional that checks for $dotestRamkumar Ramachandra2013-05-121-1/+3
* Git 1.8.3-rc1v1.8.3-rc1Junio C Hamano2013-05-031-1/+1
* Merge branch 'tr/unpack-entry-use-after-free-fix'Junio C Hamano2013-05-031-1/+0
|\
| * unpack_entry: avoid freeing objects in base cacheThomas Rast2013-04-301-1/+0
* | Sync with maintJunio C Hamano2013-05-032-3/+3
|\ \
| * \ Merge branch 'tr/remote-tighten-commandline-parsing' into maintJunio C Hamano2013-05-033-3/+25
| |\ \
| * \ \ Merge branch 'jn/glossary-revision' into maintJunio C Hamano2013-05-031-3/+1
| |\ \ \
| * | | | completion: zsh: don't override suffix on _detaultFelipe Contreras2013-05-031-1/+1
| * | | | Documentation/git-commit: Typo under --editAnders Granskogen Bjørnstad2013-05-021-2/+2
* | | | | Update draft release notes to 1.8.3Junio C Hamano2013-05-011-3/+16
* | | | | Fix grammar in the 1.8.3 release notes.Marc Branchaud2013-05-011-78/+77
* | | | | Merge branch 'hb/git-pm-tempfile'Junio C Hamano2013-05-011-1/+1
|\ \ \ \ \
| * | | | | Git.pm: call tempfile from File::Temp as a regular functionH. Merijn Brand2013-04-291-1/+1
* | | | | | Merge branch 'rs/pp-user-info-without-extra-allocation'Junio C Hamano2013-05-011-35/+14
|\ \ \ \ \ \
| * | | | | | pretty: remove intermediate strbufs from pp_user_info()René Scharfe2013-04-251-20/+9
| * | | | | | pretty: simplify output line length calculation in pp_user_info()René Scharfe2013-04-251-4/+3
| * | | | | | pretty: simplify input line length calculation in pp_user_info()René Scharfe2013-04-251-11/+2
* | | | | | | Merge branch 'tr/remote-tighten-commandline-parsing'Junio C Hamano2013-05-013-3/+25
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | remote: 'show' and 'prune' can take more than one remoteThomas Rast2013-04-242-10/+5
| * | | | | | remote: check for superfluous arguments in 'git remote add'Thomas Rast2013-04-242-2/+2
| * | | | | | remote: add a test for extra arguments, according to docsThomas Rast2013-04-241-0/+27
* | | | | | | Merge branch 'zk/prompt-rebase-step'Junio C Hamano2013-05-013-9/+31
|\ \ \ \ \ \ \
| * | | | | | | bash-prompt.sh: show where rebase is at when stoppedZoltan Klinger2013-04-253-9/+31
| |/ / / / / /
* | | | | | | git-completion.bash: add remote.pushdefault to config listRamkumar Ramachandra2013-04-291-0/+5
* | | | | | | git-completion.bash: add branch.*.pushremote to config listRamkumar Ramachandra2013-04-291-2/+2
* | | | | | | Merge branch 'maint'Junio C Hamano2013-04-292-9/+136
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge branch 'fc/zsh-completion' into maintJunio C Hamano2013-04-291-8/+126
| |\ \ \ \ \ \
| | * | | | | | complete: zsh: use zsh completion for the main cmdFelipe Contreras2013-04-291-1/+119
| | * | | | | | complete: zsh: trivial simplificationFelipe Contreras2013-04-291-8/+8
| * | | | | | | git-completion.bash: complete branch.*.rebase as booleanRamkumar Ramachandra2013-04-291-0/+4
| * | | | | | | git-completion.bash: add diff.submodule to config listRamkumar Ramachandra2013-04-291-0/+5
| * | | | | | | git-completion.bash: lexical sorting for diff.statGraphWidthRamkumar Ramachandra2013-04-291-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'maint'Junio C Hamano2013-04-282-44/+6
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | documentation: trivial whitespace cleanupsFelipe Contreras2013-04-281-6/+6
| * | | | | | t/Makefile: remove smoke test targetsJohn Keeping2013-04-281-38/+0
* | | | | | | Merge branch 'nd/pretty-formats'Junio C Hamano2013-04-281-2/+2
|\ \ \ \ \ \ \
| * | | | | | | pretty: Fix bug in truncation support for %>, %< and %><Ramsay Jones2013-04-281-2/+2
* | | | | | | | Merge branch 'jk/check-corrupt-objects-carefully'Junio C Hamano2013-04-281-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | clone: Make the 'junk_mode' symbol a file staticRamsay Jones2013-04-281-1/+1
* | | | | | | | | Merge branch 'jk/merge-tree-added-identically'Junio C Hamano2013-04-282-1/+14
|\ \ \ \ \ \ \ \ \